ffi-gdal 1.0.0.beta5 → 1.0.0.beta6

data/lib/gdal/color_entry.rb

@@ -7,6 +7,7 @@ module GDAL
     # @return [FFI::GDAL::ColorEntry]
     attr_reader :c_struct
 
+    # @param color_entry [FFI::GDAL::ColorEntry]
     def initialize(color_entry = nil)
       @c_struct = color_entry || FFI::GDAL::ColorEntry.new
     end

data/lib/gdal/color_interpretation.rb

@@ -3,13 +3,13 @@ module GDAL
     # @param gdal_color_interp [FFI::GDAL::ColorInterp]
     # @return [String]
     def self.name(gdal_color_interp)
-      FFI::GDAL.GDALGetColorInterpretationName(gdal_color_interp)
+      FFI::GDAL::GDAL.GDALGetColorInterpretationName(gdal_color_interp)
     end
 
     # @param name [String]
     # @return [FFI::GDAL::ColorInterp]
     def self.by_name(name)
-      FFI::GDAL.GDALGetColorInterpretationByName(name)
+      FFI::GDAL::GDAL.GDALGetColorInterpretationByName(name)
     end
   end
 end

data/lib/gdal/color_table.rb

@@ -1,4 +1,4 @@
-require_relative '../ffi/gdal'
+require_relative '../gdal'
 require_relative 'color_table_mixins/extensions'
 require_relative 'color_entry'
 
@@ -25,14 +25,14 @@ module GDAL
     # @raise [GDAL::InvalidColorTable] If unable to create the color table.
     def initialize(palette_interp_or_pointer)
       @c_pointer =
-        if FFI::GDAL::PaletteInterp[palette_interp_or_pointer]
-          FFI::GDAL.GDALCreateColorTable(palette_interp_or_pointer)
+        if FFI::GDAL::GDAL::PaletteInterp[palette_interp_or_pointer]
+          FFI::GDAL::GDAL.GDALCreateColorTable(palette_interp_or_pointer)
         else
           palette_interp_or_pointer
         end
 
       if !@c_pointer.is_a?(FFI::Pointer) || @c_pointer.null?
-        fail GDAL::InvalidColorTable,
+        raise GDAL::InvalidColorTable,
           "Unable to create #{self.class.name} from #{palette_interp_or_pointer}"
       end
 
@@ -44,14 +44,14 @@ module GDAL
       when :GPI_CMYK then extend GDAL::ColorTableTypes::CMYK
       when :GPI_HLS then extend GDAL::ColorTableTypes::HLS
       else
-        fail "Unknown PaletteInterpretation: #{palette_interpretation}"
+        raise "Unknown PaletteInterpretation: #{palette_interpretation}"
       end
     end
 
     def destroy!
       return unless @c_pointer
 
-      FFI::GDAL.GDALDestroyColorTable(@c_pointer)
+      FFI::GDAL::GDAL.GDALDestroyColorTable(@c_pointer)
       @c_pointer = nil
     end
 
@@ -59,7 +59,7 @@ module GDAL
     #
     # @return [GDAL::ColorTable]
     def clone
-      ct_ptr = FFI::GDAL.GDALCloneColorTable(@c_pointer)
+      ct_ptr = FFI::GDAL::GDAL.GDALCloneColorTable(@c_pointer)
       return nil if ct_ptr.null?
 
       GDAL::ColorTable.new(ct_ptr)
@@ -67,21 +67,21 @@ module GDAL
 
     # Usually :GPI_RGB.
     #
-    # @return [Symbol] One of FFI::GDAL::PaletteInterp.
+    # @return [Symbol] One of FFI::GDAL::GDAL::PaletteInterp.
     def palette_interpretation
-      FFI::GDAL.GDALGetPaletteInterpretation(@c_pointer)
+      FFI::GDAL::GDAL.GDALGetPaletteInterpretation(@c_pointer)
     end
 
     # @return [Fixnum]
     def color_entry_count
-      FFI::GDAL.GDALGetColorEntryCount(@c_pointer)
+      FFI::GDAL::GDAL.GDALGetColorEntryCount(@c_pointer)
     end
 
     # @param index [Fixnum]
     # @return [GDAL::ColorEntry]
     def color_entry(index)
       @color_entries.fetch(index) do
-        color_entry = FFI::GDAL.GDALGetColorEntry(@c_pointer, index)
+        color_entry = FFI::GDAL::GDAL.GDALGetColorEntry(@c_pointer, index)
         return nil if color_entry.null?
 
         GDAL::ColorEntry.new(color_entry)
@@ -94,7 +94,7 @@ module GDAL
       entry = color_entry(index)
       return unless entry
 
-      FFI::GDAL.GDALGetColorEntryAsRGB(@c_pointer, index, entry.c_pointer)
+      FFI::GDAL::GDAL.GDALGetColorEntryAsRGB(@c_pointer, index, entry.c_pointer)
       return nil if entry.c_pointer.null?
 
       entry
@@ -123,7 +123,7 @@ module GDAL
       entry.color3 = three if three
       entry.color4 = four if four
 
-      FFI::GDAL.GDALSetColorEntry(@c_pointer, index, entry.c_struct)
+      FFI::GDAL::GDAL.GDALSetColorEntry(@c_pointer, index, entry.c_struct)
       @color_entries.insert(index, entry)
 
       entry
@@ -142,7 +142,7 @@ module GDAL
       start_color_ptr = start_color.c_struct
       end_color_ptr = end_color.c_struct
 
-      FFI::GDAL.GDALCreateColorRamp(@c_pointer, start_index,
+      FFI::GDAL::GDAL.GDALCreateColorRamp(@c_pointer, start_index,
         start_color_ptr,
         end_index,
         end_color_ptr)

data/lib/gdal/color_table_mixins/extensions.rb

@@ -5,17 +5,17 @@ module GDAL
     module Extensions
       def color_entries_for(color_number)
         unless (1..4).to_a.include? color_number
-          fail "Invalid ColorEntry number 'color#{color_number}'"
+          raise "Invalid ColorEntry number 'color#{color_number}'"
         end
 
-        color_entry_count.times.map do |i|
+        Array.new(color_entry_count) do |i|
           color_entry(i).send("color#{color_number}".to_sym)
         end
       end
 
       # @return [Array<GDAL::ColorEntry>]
       def color_entries
-        color_entry_count.times.map do |i|
+        Array.new(color_entry_count) do |i|
           color_entry(i)
         end
       end
@@ -25,7 +25,7 @@ module GDAL
       #
       # @return [Array<GDAL::ColorEntry>]
       def color_entries_as_rgb
-        color_entry_count.times.map do |i|
+        Array.new(color_entry_count) do |i|
           color_entry_as_rgb(i)
         end
       end

data/lib/gdal/cpl_error_handler.rb

@@ -1,5 +1,3 @@
-require_relative 'exceptions'
-
 module GDAL
   # This is used to override GDAL's built-in error handling.  By default, GDAL
   # only logs errors to STDOUT, which doesn't allow a whole lot of flexibility.
@@ -10,24 +8,24 @@ module GDAL
     include GDAL::Logger
 
     CPLE_MAP = [
-      { cple: :CPLE_None, exception: nil },
-      { cple: :CPLE_AppDefined, exception: nil },
-      { cple: :CPLE_OutOfMemory, exception: ::NoMemoryError },
-      { cple: :CPLE_FileIO, exception: ::IOError },
-      { cple: :CPLE_OpenFailed, exception: GDAL::OpenFailure },
-      { cple: :CPLE_IllegalArg, exception: ::ArgumentError },
-      { cple: :CPLE_NotSupported, exception: GDAL::UnsupportedOperation },
+      { cple: :CPLE_None,           exception: nil },
+      { cple: :CPLE_AppDefined,     exception: nil },
+      { cple: :CPLE_OutOfMemory,    exception: ::NoMemoryError },
+      { cple: :CPLE_FileIO,         exception: ::IOError },
+      { cple: :CPLE_OpenFailed,     exception: GDAL::OpenFailure },
+      { cple: :CPLE_IllegalArg,     exception: ::ArgumentError },
+      { cple: :CPLE_NotSupported,   exception: GDAL::UnsupportedOperation },
       { cple: :CPLE_AssertionFailed, exception: ::RuntimeError },
-      { cple: :CPLE_NoWriteAccess, exception: GDAL::NoWriteAccess },
-      { cple: :CPLE_UserInterrupt, exception: ::Interrupt },
-      { cple: :CPLE_ObjectNull, exception: GDAL::NullObject }
-    ]
+      { cple: :CPLE_NoWriteAccess,  exception: GDAL::NoWriteAccess },
+      { cple: :CPLE_UserInterrupt,  exception: ::Interrupt },
+      { cple: :CPLE_ObjectNull,     exception: GDAL::NullObject }
+    ].freeze
 
     FAIL_PROC = lambda do |exception, message|
       ex = exception ? exception.new(message) : GDAL::Error.new(message)
       ex.set_backtrace(caller(4))
 
-      fail(ex)
+      raise(ex)
     end
 
     SUCCESS_PROC = proc { true }

data/lib/gdal/data_type.rb

@@ -1,38 +1,39 @@
 module GDAL
+  # Info about GDAL data types (GDT symbols).
   class DataType
     # The size in bits.
     #
-    # @param gdal_data_type [FFI::GDAL::DataType]
+    # @param gdal_data_type [FFI::GDAL::GDAL::DataType]
     # @return [Fixnum]
     def self.size(gdal_data_type)
-      FFI::GDAL.GDALGetDataTypeSize(gdal_data_type)
+      FFI::GDAL::GDAL.GDALGetDataTypeSize(gdal_data_type)
     end
 
-    # @param gdal_data_type [FFI::GDAL::DataType]
+    # @param gdal_data_type [FFI::GDAL::GDAL::DataType]
     # @return [Fixnum]
     def self.complex?(gdal_data_type)
-      FFI::GDAL.GDALDataTypeIsComplex(gdal_data_type)
+      FFI::GDAL::GDAL.GDALDataTypeIsComplex(gdal_data_type)
     end
 
-    # @param gdal_data_type [FFI::GDAL::DataType]
+    # @param gdal_data_type [FFI::GDAL::GDAL::DataType]
     # @return [String]
     def self.name(gdal_data_type)
-      FFI::GDAL.GDALGetDataTypeName(gdal_data_type)
+      FFI::GDAL::GDAL.GDALGetDataTypeName(gdal_data_type)
     end
 
     # The data type's symbolic name.
     #
     # @param name [String]
-    # @return [FFI::GDAL::DataType]
+    # @return [FFI::GDAL::GDAL::DataType]
     def self.by_name(name)
-      FFI::GDAL.GDALGetDataTypeByName(name)
+      FFI::GDAL::GDAL.GDALGetDataTypeByName(name.to_s)
     end
 
-    # @param gdal_data_type1 [FFI::GDAL::DataType]
-    # @param gdal_data_type2 [FFI::GDAL::DataType]
-    # @return [FFI::GDAL::DataType]
+    # @param gdal_data_type1 [FFI::GDAL::GDAL::DataType]
+    # @param gdal_data_type2 [FFI::GDAL::GDAL::DataType]
+    # @return [FFI::GDAL::GDAL::DataType]
     def self.union(gdal_data_type1, gdal_data_type2)
-      FFI::GDAL.GDALDataTypeUnion(gdal_data_type1, gdal_data_type2)
+      FFI::GDAL::GDAL.GDALDataTypeUnion(gdal_data_type1, gdal_data_type2)
     end
   end
 end