miscellaneous build fixing and version bumpinglibcdr-0.0.1

6 files changed, 53 insertions, 20 deletions

diff --git a/build/win32/libcdr.dsp b/build/win32/libcdr.dsp
index 2105cb8..8cb347d 100644
--- a/build/win32/libcdr.dsp
+++ b/build/win32/libcdr.dsp
@@ -87,6 +87,10 @@ LIB32=link.exe -lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

+SOURCE=..\..\src\lib\CDRCollector.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\src\lib\CDRDocument.cpp

 # End Source File

 # Begin Source File

@@ -99,10 +103,18 @@ SOURCE=..\..\src\lib\CDRParser.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\src\lib\CDRPath.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\src\lib\CDRSVGGenerator.cpp

 # End Source File

 # Begin Source File

 

+SOURCE=..\..\src\lib\CDRTypes.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\src\lib\libcdr_utils.cpp

 # End Source File

 # End Group

@@ -111,6 +123,10 @@ SOURCE=..\..\src\lib\libcdr_utils.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=..\..\src\lib\CDRCollector.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\src\lib\CDRDocument.h

 # End Source File

 # Begin Source File

@@ -123,10 +139,18 @@ SOURCE=..\..\src\lib\CDRParser.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\src\lib\CDRPath.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\src\lib\CDRSVGGenerator.h

 # End Source File

 # Begin Source File

 

+SOURCE=..\..\src\lib\CDRTypes.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\src\lib\libcdr.h

 # End Source File

 # Begin Source File

diff --git a/configure.ac b/configure.ac
index e21b478..bf46063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.65])
 # ====================
 m4_define([libcdr_version_major],[0])
 m4_define([libcdr_version_minor],[0])
-m4_define([libcdr_version_micro],[0])
+m4_define([libcdr_version_micro],[1])
 m4_define([libcdr_version],[libcdr_version_major.libcdr_version_minor.libcdr_version_micro])
 
 # =============
diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp
index 1b702e4..96ed979 100644
--- a/src/lib/CDRCollector.cpp
+++ b/src/lib/CDRCollector.cpp
@@ -31,6 +31,10 @@
 #include "CDRCollector.h"
 #include "libcdr_utils.h"
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 libcdr::CDRCollector::CDRCollector(libwpg::WPGPaintInterface *painter) :
   m_painter(painter),
   m_isPageProperties(false),
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 75fc692..dc62a3f 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -29,9 +29,7 @@
 
 #include <libwpd-stream/libwpd-stream.h>
 #include <locale.h>
-#include <sstream>
-#include <string>
-#include <cmath>
+#include <math.h>
 #include <set>
 #include <string.h>
 #include "libcdr_utils.h"
@@ -43,6 +41,10 @@
 #define DUMP_PREVIEW_IMAGE 0
 #endif
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 libcdr::CDRParser::CDRParser(WPXInputStream *input, libcdr::CDRCollector *collector)
   : m_input(input),
     m_collector(collector),
@@ -204,12 +206,12 @@ void libcdr::CDRParser::readRecord(WPXString fourCC, unsigned length, WPXInputSt
     readOutl(input);
   else if (fourCC == "fild")
     readFild(input);
-  else if (fourCC == "arrw")
-    ;
-  /*  else if (fourCC == "obox")
-      readObox(input);
-    else if (fourCC == "flgs")
-      readFlags(input); */
+  /*  else if (fourCC == "arrw")
+      ;
+     else if (fourCC == "obox")
+       readObox(input);
+     else if (fourCC == "flgs")
+       readFlags(input); */
   input->seek(recordStart + length, WPX_SEEK_CUR);
 }
 
@@ -264,7 +266,7 @@ void libcdr::CDRParser::readEllipse(WPXInputStream *input)
   double angle1 = M_PI * (double)readS32(input) / 180000000.0;
   double angle2 = M_PI * (double)readS32(input) / 180000000.0;
   double rotation = 0;
-  bool pie(readU32(input));
+  bool pie(0 != readU32(input));
 
   double cx = x/2.0;
   double cy = y/2.0;
@@ -373,11 +375,11 @@ void libcdr::CDRParser::readText(WPXInputStream *input)
   int x0 = readS32(input);
   int y0 = readS32(input);
 }
-*/
 
 void libcdr::CDRParser::readBitmap(WPXInputStream *input)
 {
 }
+*/
 
 void libcdr::CDRParser::readTrfd(WPXInputStream *input)
 {
@@ -501,9 +503,9 @@ void libcdr::CDRParser::readLoda(WPXInputStream *input)
       else if (chunkType == 0x03) // Line and curve
         readLineAndCurve(input);
       /*      else if (chunkType == 0x04) // Text
-              readText(input); */
+              readText(input);
       else if (chunkType == 0x05)
-        readBitmap(input);
+        readBitmap(input); */
     }
     else if (argTypes[i] == 0x14)
       m_collector->collectFildId(readU32(input));
diff --git a/src/lib/CDRParser.h b/src/lib/CDRParser.h
index a2c79e3..9cc301a 100644
--- a/src/lib/CDRParser.h
+++ b/src/lib/CDRParser.h
@@ -60,7 +60,7 @@ private:
   void readEllipse(WPXInputStream *input);
   void readLineAndCurve(WPXInputStream *input);
 //  void readText(WPXInputStream *input);
-  void readBitmap(WPXInputStream *input);
+//  void readBitmap(WPXInputStream *input);
   void readTrfd(WPXInputStream *input);
   void readFild(WPXInputStream *input);
   void readOutl(WPXInputStream *input);
diff --git a/src/lib/makefile.mk b/src/lib/makefile.mk
index 3a3792a..62d7bb5 100644
--- a/src/lib/makefile.mk
+++ b/src/lib/makefile.mk
@@ -29,11 +29,14 @@ INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg
 .ENDIF
 
 SLOFILES= \
-        $(SLO)$/CDRDocument.obj \
-		$(SLO)$/CDRInternalStream.obj \
-		$(SLO)$/CDRParser.obj \
-		$(SLO)$/CDRSVGGenerator.obj \
-		$(SLO)$/libcdr_utils.obj
+    $(SLO)$/CDRCollector.obj \
+    $(SLO)$/CDRDocument.obj \
+    $(SLO)$/CDRInternalStream.obj \
+    $(SLO)$/CDRParser.obj \
+    $(SLO)$/CDRPath.obj \
+    $(SLO)$/CDRSVGGenerator.obj \
+    $(SLO)$/CDRTypes.obj \
+    $(SLO)$/libcdr_utils.obj
 
 LIB1ARCHIV=$(LB)$/libcdrlib.a
 LIB1TARGET=$(SLB)$/$(TARGET).lib