Changeset 3110 in orxonox.OLD for orxonox/branches/images/importer

Timestamp:

Dec 6, 2004, 1:11:56 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/images: test for jpeg and png libs in configure.ac and material.cc/h

Location:

orxonox/branches/images/importer

Files:

• material.cc (modified) (4 diffs)
• material.h (modified) (2 diffs)

orxonox/branches/images/importer/material.cc

@@ -564 +564 @@
 bool Material::loadJPG (char* jpgName, GLuint* texture)
 {
+#ifdef HAVE_JPEGLIB_H
   struct jpeg_decompress_struct cinfo;
   Image *pImage = NULL;
@@ -649 +650 @@
     }
   return true;
+#else /* HAVE_JPEGLIB_H */
+  if (verbose >=1)
+    printf ("sorry, but you did not compile with jpeg-support.\nEither install SDL_image or jpeglib, and recompile to see the image\n");
+  return false;
+#endif /* HAVE_JPEGLIB_H */
+
 }
 
@@ -980 +987 @@
 bool Material::loadPNG(const char* pngName, GLuint* texture)
 {
+#ifdef HAVE_PNG_H
   Image* pImage = new Image;
 
@@ -1099 +1107 @@
   
   return true;
+#else /* HAVE_PNG_H */
+  if (verbose >=1)
+    printf ("sorry, but you did not compile with png-support.\nEither install SDL_image or libpng, and recompile to see the image\n");
+  return false;
+#endif /* HAVE_PNG_H */
+
 }
 

orxonox/branches/images/importer/material.h

@@ -17 +17 @@
 #if HAVE_CONFIG_H 
 #include <config.h> 
-#endif
+#endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_SDL_SDL_IMAGE_H
@@ -23 +23 @@
 #else
 // IMAGE LIBS //
+#ifdef HAVE_JPEGLIB_H
 extern "C"{         // This has to be done, because not a c++ lib
 #include <jpeglib.h>
 }
+#endif /* HAVE_JPEGLIB_H */
+#ifdef HAVE_PNG_H
 #include <png.h>
-#endif
+#endif /* HAVE_PNG_H */
+#endif /* HAVE_SDL_SDL_IMAGE_H */
 
 //! Class to handle Materials.