*** empty log message ***

panda/src/egg/eggCurve.h

@@ -15,7 +15,7 @@
 // Description : A parametric curve of some kind.  See
 //               EggNurbsCurve.
 ////////////////////////////////////////////////////////////////////
-class EggCurve : public EggPrimitive {
+class EXPCL_PANDAEGG EggCurve : public EggPrimitive {
 public:
   INLINE EggCurve(const string &name = "");
   INLINE EggCurve(const EggCurve &copy);

panda/src/egg/eggNurbsCurve.h

@@ -16,7 +16,7 @@
 // 	 Class : EggNurbsCurve
 // Description : A parametric NURBS curve.
 ////////////////////////////////////////////////////////////////////
-class EggNurbsCurve : public EggCurve {
+class EXPCL_PANDAEGG EggNurbsCurve : public EggCurve {
 public:
   INLINE EggNurbsCurve(const string &name = "");
   INLINE EggNurbsCurve(const EggNurbsCurve &copy);

panda/src/egg/eggNurbsSurface.h

@@ -19,7 +19,7 @@
 // 	 Class : EggNurbsSurface
 // Description : A parametric NURBS surface.
 ////////////////////////////////////////////////////////////////////
-class EggNurbsSurface : public EggSurface {
+class EXPCL_PANDAEGG EggNurbsSurface : public EggSurface {
 public:
   typedef list<PT(EggNurbsCurve)> Curves;
   typedef Curves Loop;

panda/src/egg/eggSurface.h

@@ -15,7 +15,7 @@
 // Description : A parametric surface of some kind.  See
 //               EggNurbsSurface.
 ////////////////////////////////////////////////////////////////////
-class EggSurface : public EggPrimitive {
+class EXPCL_PANDAEGG EggSurface : public EggPrimitive {
 public:
   INLINE EggSurface(const string &name = "");
   INLINE EggSurface(const EggSurface &copy);

panda/src/egg/eggTexture.h

@@ -149,7 +149,7 @@ private:
 //               referenced EggTexture pointers are in sorted order,
 //               false otherwise.
 ////////////////////////////////////////////////////////////////////
-class UniqueEggTextures {
+class EXPCL_PANDAEGG UniqueEggTextures {
 public:
   INLINE UniqueEggTextures(int eq = ~0);
   INLINE bool operator ()(const EggTexture *t1, const EggTexture *t2) const;
@@ -162,7 +162,7 @@ public:
 // Description : An STL function object for sorting textures into
 //               order by TRef name.
 ////////////////////////////////////////////////////////////////////
-class TRefEggTextures {
+class EXPCL_PANDAEGG TRefEggTextures {
 public:
   INLINE bool operator ()(const EggTexture *t1, const EggTexture *t2) const;
 };

panda/src/egg/parserDefs.h

@@ -30,7 +30,7 @@ void egg_cleanup_parser();
 // union), so we'll use a class instead.  That means we need to
 // declare it externally, here.
 
-class EggTokenType {
+class EXPCL_PANDAEGG EggTokenType {
 public:
   double _number;
   string _string;

panda/src/pnmimagetypes/pnmFileTypeJPG.cxx

@@ -7,7 +7,7 @@
 #include "config_pnmimagetypes.h"
 
 static const char * const extensions[] = {
-  "jpg"
+  "jpg", "jpeg"
 };
 static const int num_extensions = sizeof(extensions) / sizeof(const char *);
 
@@ -29,7 +29,7 @@ PNMFileTypeJPG() {
 ////////////////////////////////////////////////////////////////////
 string PNMFileTypeJPG::
 get_name() const {
-  return "Jpeg";
+  return "JPEG";
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -65,7 +65,7 @@ get_extension(int n) const {
 ////////////////////////////////////////////////////////////////////
 string PNMFileTypeJPG::
 get_suggested_extension() const {
-  return "bmp";
+  return "jpg";
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -89,7 +89,8 @@ has_magic_number() const {
 bool PNMFileTypeJPG::
 matches_magic_number(const string &magic_number) const {
   nassertr(magic_number.size() >= 2, false);
-  return (magic_number.substr(0, 2) == "BM");
+  return ((char)magic_number[0] == (char)0xff && 
+	  (char)magic_number[1] == (char)0xd8);
 }
 
 ////////////////////////////////////////////////////////////////////

pandatool/src/flt/config_flt.h

@@ -10,7 +10,7 @@
 
 #include <notifyCategoryProxy.h>
 
-NotifyCategoryDecl(flt, EXPCL_MISC, EXPTP_MISC);
+NotifyCategoryDeclNoExport(flt);
 
 extern const bool flt_error_abort;
 

pandatool/src/fltprogs/Sources.pp

@@ -3,6 +3,7 @@
   #define LOCAL_LIBS cvscopy flt
 
   #define OTHER_LIBS \
+    linmath:c panda:m \
     express:c pandaexpress:m \
     dtoolutil:c dconfig:c dtool:m pystub
 

pandatool/src/softprogs/Sources.pp

@@ -3,6 +3,7 @@
   #define LOCAL_LIBS progbase
 
   #define OTHER_LIBS \
+    linmath:c panda:m \
     express:c pandaexpress:m \
     dtoolutil:c dconfig:c dtool:m pystub