rpms/comical/devel comical-0.4-jpe.patch, NONE, 1.1 comical.spec, 1.2, 1.3

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/comical/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15613

Modified Files:
	comical.spec 
Added Files:
	comical-0.4-jpe.patch 
Log Message:

Add support for image files that end in ".jpe". These are most likely .jpeg
files that were truncated during packaging or compression.


comical-0.4-jpe.patch:

--- NEW FILE comical-0.4-jpe.patch ---
--- comical-0.4/src/ComicBookBZ2.cpp.BAD	2005-04-10 09:43:14.000000000 -0500
+++ comical-0.4/src/ComicBookBZ2.cpp	2005-04-10 09:43:37.000000000 -0500
@@ -110,7 +110,7 @@
     /* Now some CBB contributors are lazy and don't order their pages inside
        the archive. By putting the filename and the size into the same entry, we
        can use the STL's sort() algorithm and split them up later. */
-    if (page.Right(5).Upper() == ".JPEG" || page.Right(4).Upper() == ".JPG" ||
+    if (page.Right(5).Upper() == ".JPEG" || page.Right(4).Upper() == ".JPG" || page.Right(4).Upper() == ".JPE" ||
 	page.Right(5).Upper() == ".TIFF" || page.Right(4).Upper() == ".TIF" ||
 	page.Right(4).Upper() == ".GIF" ||
 	page.Right(4).Upper() == ".PNG" ) {
--- comical-0.4/src/ComicBookZIP.cpp.BAD	2005-04-10 09:45:08.000000000 -0500
+++ comical-0.4/src/ComicBookZIP.cpp	2005-04-10 09:45:17.000000000 -0500
@@ -104,7 +104,7 @@
     /* Now some CBZ contributors are lazy and don't order their pages
        inside the archive.  By putting the filename and the size into the same
        entry, we can use the STL's sort() algorithm and split them up later. */
-    if (	page.Right(5).Upper() == ".JPEG" || page.Right(4).Upper() == ".JPG" ||
+    if (	page.Right(5).Upper() == ".JPEG" || page.Right(4).Upper() == ".JPG" || page.Right(4).Upper() == ".JPE" ||
 		page.Right(5).Upper() == ".TIFF" || page.Right(4).Upper() == ".TIF" ||
 		page.Right(4).Upper() == ".GIF" ||
 		page.Right(4).Upper() == ".PNG" ) {
--- comical-0.4/src/ComicBookRAR.cpp.BAD	2005-04-10 09:43:51.000000000 -0500
+++ comical-0.4/src/ComicBookRAR.cpp	2005-04-10 09:44:10.000000000 -0500
@@ -113,7 +113,7 @@
     /* Now some CBR contributors are lazy and don't order their pages
        inside the archive.  By putting the filename and the size into the same
        entry, we can use the STL's sort() algorithm and split them up later. */
-    if (page.Right(5).Upper() == ".JPEG" || page.Right(4).Upper() == ".JPG" ||
+    if (page.Right(5).Upper() == ".JPEG" || page.Right(4).Upper() == ".JPG" || page.Right(4).Upper() == ".JPE" ||
 	page.Right(5).Upper() == ".TIFF" || page.Right(4).Upper() == ".TIF" ||
 	page.Right(4).Upper() == ".GIF" || page.Right(4).Upper() == ".PNG" ) {
       if (size > 0) { // empty files and directories have length 0


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/comical.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comical.spec	10 Apr 2005 03:55:52 -0000	1.2
+++ comical.spec	10 Apr 2005 14:50:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name: comical
 Version: 0.4
-Release: 6
+Release: 7
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@
 Patch1: comical-0.4-sort.patch
 Patch2: comical-0.4-nounrar.patch
 Patch3: comical-0.4-advancedsort.patch
+Patch4: comical-0.4-jpe.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
@@ -28,6 +29,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure
@@ -54,6 +56,10 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Apr 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-7
+- Support images that end in ".jpe". Most likely, .jpeg files that 
+  were truncated by saving/compressing.
+
 * Sat Apr  9 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-6
 - Minor spec cleanups.