Merge branch 'master' of git://git.ucc.asn.au/ipdf/code

diff --git a/src/document.cpp b/src/document.cpp
index a4d6be6..a6c6fad 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -3,6 +3,8 @@
 #include <cstdio>
 #include <fstream>
 
+#include "stb_truetype.h"
+
 using namespace IPDF;
 using namespace std;
 
@@ -282,8 +284,8 @@ void Document::LoadSVG(const string & filename, const Rect & bounds)
        // Combine all SVG tags into one thing because lazy
        for (xml_node svg = doc_xml.child("svg"); svg; svg = svg.next_sibling("svg"))
        {
-               Real width = svg.attribute("width").as_float() * bounds.w;
-               Real height = svg.attribute("width").as_float() * bounds.h;
+               Real width = Real(svg.attribute("width").as_float()) * bounds.w;
+               Real height = Real(svg.attribute("width").as_float()) * bounds.h;
                
                
                // Rectangles
@@ -308,8 +310,8 @@ void Document::LoadSVG(const string & filename, const Rect & bounds)
                        
                        Real x = (cx - r)/width + bounds.x; 
                        Real y = (cy - r)/height + bounds.y; 
-                       Real w = 2*r/width; 
-                       Real h = 2*r/height;
+                       Real w = Real(2)*r/width; 
+                       Real h = Real(2)*r/height;
                        
                        Rect rect(x,y,w,h);
                        Add(CIRCLE_FILLED, rect,0);
@@ -394,9 +396,9 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                if (command == "m" || command == "M")
                {
                        Debug("Construct moveto command");
-                       Real dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+                       Real dx = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.w;
                        assert(GetToken(d,token,i) == ",");
-                       Real dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+                       Real dy = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.h;
                        
                        x[0] = (relative) ? x[0] + dx : dx;
                        y[0] = (relative) ? y[0] + dy : dy;
@@ -409,25 +411,25 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                else if (command == "c" || command == "C" || command == "q" || command == "Q")
                {
                        Debug("Construct curveto command");
-                       Real dx = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.w;
+                       Real dx = Real(strtod(GetToken(d,token,i).c_str(),NULL))/bounds.w;
                        assert(GetToken(d,token,i) == ",");
-                       Real dy = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.h;
+                       Real dy = Real(strtod(GetToken(d,token,i).c_str(),NULL))/bounds.h;
                        
                        x[1] = (relative) ? x[0] + dx : dx;
                        y[1] = (relative) ? y[0] + dy : dy;
                        
-                       dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+                       dx = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.w;
                        assert(GetToken(d,token,i) == ",");
-                       dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+                       dy = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.h;
                        
                        x[2] = (relative) ? x[0] + dx : dx;
                        y[2] = (relative) ? y[0] + dy : dy;
                        
                        if (command != "q" && command != "Q")
                        {
-                               dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+                               dx = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.w;
                                assert(GetToken(d,token,i) == ",");
-                               dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+                               dy = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.h;
                                x[3] = (relative) ? x[0] + dx : dx;
                                y[3] = (relative) ? y[0] + dy : dy;
                        }
@@ -435,6 +437,11 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                        {
                                x[3] = x[2];
                                y[3] = y[2];
+                               Real old_x1(x[1]), old_y1(y[1]);
+                               x[1] = x[0] + Real(2) * (old_x1 - x[0])/ Real(3);
+                               y[1] = y[0] + Real(2) * (old_y1 - y[0])/ Real(3);
+                               x[2] = x[3] + Real(2) * (old_x1 - x[3])/ Real(3);
+                               y[2] = y[3] + Real(2) * (old_y1 - y[3])/ Real(3);
                        }
                        
                        unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
@@ -452,12 +459,12 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                {
                        Debug("Construct lineto command");
                
-                       Real dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+                       Real dx = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.w;
                        assert(GetToken(d,token,i) == ",");
-                       Real dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+                       Real dy = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.h;
                        
-                       x[1] = (relative) ? x0 + dx : dx;
-                       y[1] = (relative) ? y0 + dy : dy;
+                       x[1] = (relative) ? x[0] + dx : dx;
+                       y[1] = (relative) ? y[0] + dy : dy;
                        
                        x[2] = x[1];
                        y[2] = y[1];
@@ -508,3 +515,57 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                prev_i = i;
        }
 }
+
+void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real scale, Real x, Real y)
+{
+       int glyph_index = stbtt_FindGlyphIndex(font, character);
+
+       // Check if there is actully a glyph to render.
+       if (stbtt_IsGlyphEmpty(font, glyph_index))
+       {
+               return;
+       }
+
+       stbtt_vertex *instructions;
+       int num_instructions = stbtt_GetGlyphShape(font, glyph_index, &instructions);
+
+       Real current_x(0), current_y(0);
+
+       for (int i = 0; i < num_instructions; ++i)
+       {
+               // TTF uses 16-bit signed ints for coordinates:
+               // with the y-axis inverted compared to us.
+               // Convert and scale any data.
+               Real inst_x = Real(instructions[i].x)*scale;
+               Real inst_y = Real(instructions[i].y)*-scale;
+               Real inst_cx = Real(instructions[i].cx)*scale;
+               Real inst_cy = Real(instructions[i].cy)*-scale;
+               Real old_x(current_x), old_y(current_y);
+               current_x = inst_x;
+               current_y = inst_y;
+               unsigned bezier_index;
+               switch(instructions[i].type)
+               {
+               // Move To
+               case STBTT_vmove:
+                       break;
+               // Line To
+               case STBTT_vline:
+                       bezier_index = AddBezierData(Bezier(old_x + x, old_y + y, old_x + x, old_y + y, current_x + x, current_y + y, current_x + x, current_y + y));
+                       Add(BEZIER,Rect(0,0,1,1),bezier_index);
+                       break;
+               // Quadratic Bezier To:
+               case STBTT_vcurve:
+                       // Quadratic -> Cubic:
+                       // - Endpoints are the same.
+                       // - cubic1 = quad0+(2/3)*(quad1-quad0)
+                       // - cubic2 = quad2+(2/3)*(quad1-quad2)
+                       bezier_index = AddBezierData(Bezier(old_x + x, old_y + y, old_x + Real(2)*(inst_cx-old_x)/Real(3) + x, old_y + Real(2)*(inst_cy-old_y)/Real(3) + y,
+                                               current_x + Real(2)*(inst_cx-current_x)/Real(3) + x, current_y + Real(2)*(inst_cy-current_y)/Real(3) + y, current_x + x, current_y + y));
+                       Add(BEZIER,Rect(0,0,1,1),bezier_index);
+                       break;
+               }
+       }
+
+       stbtt_FreeShape(font, instructions);
+}

diff --git a/src/document.h b/src/document.h
index c0adc52..62f624c 100644 (file)
--- a/src/document.h
+++ b/src/document.h
@@ -4,6 +4,8 @@
 #include "ipdf.h"
 #include "quadtree.h"
 
+typedef struct stbtt_fontinfo stbtt_fontinfo;
+
 namespace IPDF
 {
        class Document
@@ -29,6 +31,8 @@ namespace IPDF
                        
                        void AddPathFromString(const std::string & d, const Rect & bounds);
 
+                       void AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real scale, Real x, Real y);
+
 #ifndef QUADTREE_DISABLED
                        inline const QuadTree& GetQuadTree() { if (m_quadtree.root_id == QUADTREE_EMPTY) { GenBaseQuadtree(); } return m_quadtree; }
                        QuadTreeIndex GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type);

diff --git a/src/gmpint.h b/src/gmpint.h
index f39cd51..6ed5303 100644 (file)
--- a/src/gmpint.h
+++ b/src/gmpint.h
@@ -15,8 +15,7 @@ class Gmpint
                Gmpint(int64_t i) {mpz_init_set_si(m_op, i);}
                Gmpint(const std::string & str, int base=10) {mpz_init_set_str(m_op, str.c_str(), base);}
                Gmpint(const Gmpint & cpy) {mpz_init(m_op); mpz_set(m_op, cpy.m_op);}
-               virtual ~Gmpint() {} //TODO: Do we need to delete m_op somehow?
-               
+               virtual ~Gmpint() {mpz_clear(m_op);}
                
                operator int64_t() const {return mpz_get_si(m_op);}
                operator uint64_t() const {return mpz_get_ui(m_op);}

diff --git a/src/main.cpp b/src/main.cpp
index d7df87a..d5d4da8 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,6 @@
 #include "main.h"
 #include <unistd.h> // Because we can.
+#include "stb_truetype.h"
 int main(int argc, char ** argv)
 {      
        #ifndef __STDC_IEC_559__
@@ -81,11 +82,28 @@ int main(int argc, char ** argv)
        }
        else 
        {
-               doc.AddBezierData(Bezier(0,0,0,1,1,0));
+/*             doc.AddBezierData(Bezier(0,0,0,1,1,0));
                doc.AddBezierData(Bezier(0,0,1,0,0,1));
                doc.AddBezierData(Bezier(0,0,1,1,1,0));
-               doc.AddBezierData(Bezier(0,1,1,0,0,1));
+               doc.AddBezierData(Bezier(0,1,1,0,0,1));*/
                
+               stbtt_fontinfo font;
+               FILE *font_file = fopen("DejaVuSansMono.ttf", "rb");
+               fseek(font_file, 0, SEEK_END);
+               size_t font_file_size = ftell(font_file);
+               fseek(font_file, 0, SEEK_SET);
+               unsigned char *font_file_data = (unsigned char*)malloc(font_file_size);
+               SDL_assert(fread(font_file_data, 1, font_file_size, font_file) == font_file_size);
+               fclose(font_file);
+               stbtt_InitFont(&font, font_file_data, 0);
+
+               float font_scale = stbtt_ScaleForPixelHeight(&font, 1);
+               doc.AddFontGlyphAtPoint(&font,'a', Real(font_scale), Real(0), Real(1));  
+               doc.AddFontGlyphAtPoint(&font,'b', Real(font_scale), Real(0.5), Real(1));  
+               doc.AddFontGlyphAtPoint(&font,'c', Real(font_scale), Real(1), Real(1));  
+               doc.AddFontGlyphAtPoint(&font,'d', Real(font_scale), Real(1.5), Real(1));  
+
+               free(font_file_data);
                
                
                for(int x = 0; x < 8; ++x)
@@ -97,10 +115,10 @@ int main(int argc, char ** argv)
                                //doc.Add(BEZIER, Rect(0.2+x-4.0, 0.2+y-4.0, 0.6,0.6), (x^y)%3);
                        }
                }
-               doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 0);
+       /*      doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 0);
                doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 1);
                doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 2);
-               doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 3);
+               doc.Add(BEZIER, Rect(0.1,0.1,0.8,0.8), 3);*/
                //doc.Add(CIRCLE_FILLED, Rect(0.1,0.1,0.8,0.8), 0);
        }
        Debug("Start!");

diff --git a/src/rational.h b/src/rational.h
index 595f5f2..b019505 100644 (file)
--- a/src/rational.h
+++ b/src/rational.h
@@ -10,6 +10,8 @@
 #include <cassert>
 #include "arbint.h"
 #include "gmpint.h"
+#include <climits>
+#include <values.h>
 
 namespace IPDF
 {
@@ -162,7 +164,7 @@ struct Rational
        //Rational operator*(const Rational & r) const {return Rational(ToDouble()*r.ToDouble());}
        //Rational operator/(const Rational & r) const {return Rational(ToDouble()/r.ToDouble());}
 
-       Rational operator-() const {Rational r(*this); r.P = -r.P;}
+       Rational operator-() const {Rational r(*this); r.P = -r.P; return r;}
        Rational & operator=(const Rational & r) {P = r.P; Q = r.Q; Simplify(); return *this;}
        Rational & operator+=(const Rational & r) {this->operator=(*this+r); return *this;}
        Rational & operator-=(const Rational & r) {this->operator=(*this-r); return *this;}
@@ -171,7 +173,13 @@ struct Rational
 
        double ToDouble() const 
        {
-               return (double)P/(double)Q;
+               T num = P, denom = Q;
+               while (Tabs(num) > T(DBL_MAX))
+               {
+                       num /= T(16);
+                       denom /= T(16);
+               }
+               return ((double)(num))/((double)(denom));
        }
        bool CheckAccuracy(double d, const char * msg, double threshold = 1e-3) const
        {