From 3ec09a3b40ac6eb637fb635d9ad2f81cff6d06c5 Mon Sep 17 00:00:00 2001
From: Li Fanxi <lifanxi@freemindworld.com>
Date: Mon, 11 Oct 2010 00:49:11 +0800
Subject: [PATCH] [SBNOutput] Use jpg instead of png.

---
 src/calibre/ebooks/snb/output.py | 13 ++++---------
 src/calibre/ebooks/snb/snbml.py  |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/calibre/ebooks/snb/output.py b/src/calibre/ebooks/snb/output.py
index bd27a0614e..7dd976ff25 100644
--- a/src/calibre/ebooks/snb/output.py
+++ b/src/calibre/ebooks/snb/output.py
@@ -160,7 +160,7 @@ class SNBOutput(OutputFormatPlugin):
             mergeLast = False
             lastName = None
             for item in s:
-                from calibre.ebooks.oeb.base import OEB_DOCS, OEB_IMAGES, PNG_MIME
+                from calibre.ebooks.oeb.base import OEB_DOCS, OEB_IMAGES
                 if m.hrefs[item.href].media_type in OEB_DOCS:
                     if not item.href in outputFiles:
                         log.debug('File %s is unused in TOC. Continue in last chapter' % item.href)
@@ -203,14 +203,9 @@ class SNBOutput(OutputFormatPlugin):
                 if m.hrefs[item.href].media_type in OEB_IMAGES:
                     log.debug('Converting image: %s ...' % item.href)
                     content = m.hrefs[item.href].data
-                    if m.hrefs[item.href].media_type != PNG_MIME:
-                        # Convert & Resize image
-                        self.HandleImage(content, os.path.join(snbiDir, ProcessFileName(item.href)))
-                    else:
-                        outputFile = open(os.path.join(snbiDir, ProcessFileName(item.href)), 'wb')
-                        outputFile.write(content)
-                        outputFile.close()
-            
+                    # Convert & Resize image
+                    self.HandleImage(content, os.path.join(snbiDir, ProcessFileName(item.href)))
+
             # Package as SNB File
             snbFile = SNBFile()
             snbFile.FromDir(tdir)
diff --git a/src/calibre/ebooks/snb/snbml.py b/src/calibre/ebooks/snb/snbml.py
index 72600fa4d2..7be15d9fc6 100644
--- a/src/calibre/ebooks/snb/snbml.py
+++ b/src/calibre/ebooks/snb/snbml.py
@@ -23,10 +23,10 @@ def ProcessFileName(fileName):
     fileName = fileName.replace("#", "_")
     # Make it lower case
     fileName = fileName.lower()
-    # Change extension from jpeg to jpg
+    # Change all images to jpg
     root, ext = os.path.splitext(fileName) 
     if ext in [ '.jpeg', '.jpg', '.gif', '.svg' ]:
-        fileName = root + '.png'
+        fileName = root + '.jpg'
     return fileName