[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd/cvd_src image_io.cc
From: |
Georg Klein |
Subject: |
[libcvd-members] libcvd/cvd_src image_io.cc |
Date: |
Tue, 06 Jun 2006 12:32:32 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Georg Klein <georgklein> 06/06/06 12:32:32
Modified files:
cvd_src : image_io.cc
Log message:
Guard ImageType::JPEG, which is not always defined
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/image_io.cc?cvsroot=libcvd&r1=1.20&r2=1.21
Patches:
Index: image_io.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/image_io.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- image_io.cc 5 Jun 2006 22:17:50 -0000 1.20
+++ image_io.cc 6 Jun 2006 12:32:31 -0000 1.21
@@ -100,10 +100,13 @@
for (size_t i=0; i<suffix.length(); i++)
suffix[i] = tolower(suffix[i]);
- if (suffix == "jpg")
- return ImageType::JPEG;
- else if (suffix == "ps")
+
+ if (suffix == "ps")
return ImageType::PS;
+#ifdef CVD_IMAGE_HAVE_JPEG
+ else if (suffix == "jpg")
+ return ImageType::JPEG;
+#endif
else if (suffix == "eps")
return ImageType::EPS;
else if (suffix == "bmp")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libcvd-members] libcvd/cvd_src image_io.cc,
Georg Klein <=