Merge branch 'stevenlovegrove:master' into feature/ColourProvider

Author: tobiasmaier

components/pango_core/src/file_extension.cpp

@@ -225,6 +225,9 @@ ImageFileType FileTypeMagic(const unsigned char data[], size_t bytes)
 
 ImageFileType FileType(const std::string& filename)
 {
+    // file extension incase we need that as a hint
+    const std::string ext = FileLowercaseExtention(filename);
+
     // Check magic number of file...
     std::ifstream f(filename.c_str(), std::ios::binary );
     if(f.is_open()) {
@@ -234,13 +237,17 @@ ImageFileType FileType(const std::string& filename)
         if(f.good()) {
             ImageFileType magic_type = FileTypeMagic(magic, magic_bytes);
             if(magic_type != ImageFileTypeUnknown) {
+                if(magic_type == ImageFileTypeTiff && ext == ".arw") {
+                    // Special case where we use the extension as well as magic string
+                    magic_type = ImageFileTypeArw;
+                }
+
                 return magic_type;
             }
         }
     }
 
     // Fallback on using extension...
-    const std::string ext = FileLowercaseExtention(filename);
     return FileTypeExtension(ext);
 }
 

components/pango_image/include/pangolin/image/image_io.h

@@ -44,7 +44,7 @@ PANGOLIN_EXPORT
 TypedImage LoadImage(const std::string& filename);
 
 PANGOLIN_EXPORT
-TypedImage LoadImage(const std::string& filename, const PixelFormat& raw_fmt, size_t raw_width, size_t raw_height, size_t raw_pitch);
+TypedImage LoadImage(const std::string& filename, const PixelFormat& raw_fmt, size_t raw_width, size_t raw_height, size_t raw_pitch, size_t offset = 0);
 
 /// Quality \in [0..100] for lossy formats
 PANGOLIN_EXPORT

components/pango_image/src/image_io_packed12bit.cpp

@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <fstream>
 #include <memory>
 

components/pango_image/src/image_io_raw.cpp

@@ -6,12 +6,13 @@ namespace pangolin {
 TypedImage LoadImage(
     const std::string& filename,
     const PixelFormat& raw_fmt,
-    size_t raw_width, size_t raw_height, size_t raw_pitch
+    size_t raw_width, size_t raw_height, size_t raw_pitch, size_t offset
 ) {
     TypedImage img(raw_width, raw_height, raw_fmt, raw_pitch);
 
     // Read from file, row at a time.
     std::ifstream bFile( filename.c_str(), std::ios::in | std::ios::binary );
+    bFile.seekg(offset);
     for(size_t r=0; r<img.h; ++r) {
         bFile.read( (char*)img.ptr + r*img.pitch, img.pitch );
         if(bFile.fail()) {

components/pango_opengl/include/pangolin/gl/glfont.h

@@ -31,6 +31,7 @@
 
 #include <cstdio>
 #include <cstdarg>
+#include <unordered_map>
 
 namespace pangolin {
 
@@ -40,14 +41,14 @@ class PANGOLIN_EXPORT GlFont
     // Load GL Font data. Delay uploading as texture until first use.
     GlFont(const unsigned char* ttf_buffer, float pixel_height, int tex_w=512, int tex_h=512);
     GlFont(const std::string& filename, float pixel_height, int tex_w=512, int tex_h=512);
-    GlFont(float pixel_height, int tex_w=512, int tex_h=512);
 
     virtual ~GlFont();
 
     // Generate renderable GlText object from this font.
     GlText Text( const char* fmt, ... );
 
-    GlText Text( const std::string& str );
+    // Utf8 encoded string
+    GlText Text( const std::string& utf8 );
 
     inline float Height() const {
         return font_height_px;
@@ -62,19 +63,17 @@ class PANGOLIN_EXPORT GlFont
     // This can only be called once GL context is initialised
     void InitialiseGlTexture();
 
-    const static int FIRST_CHAR = 32;
-    const static int NUM_CHARS = 96;
-
     float font_height_px;
     float font_max_width_px;
 
-    int tex_w;
-    int tex_h;
-    unsigned char* font_bitmap;
+    ManagedImage<unsigned char> font_bitmap;
     GlTexture mTex;
 
-    GlChar chardata[NUM_CHARS];
-    GLfloat kern_table[NUM_CHARS*NUM_CHARS];
+    using codepoint_t = uint32_t;
+    using codepointpair_t = std::pair<codepoint_t, codepoint_t>;
+
+    std::map<codepoint_t, GlChar> chardata;
+    std::map<codepointpair_t, GLfloat> kern_table;
 };
 
 }