IGN:Tag release

setup/upload.py

@@ -356,7 +356,7 @@ class UploadUserManual(Command): # {{{
                                 zf.write(os.path.join(x, y))
             bname = self.b(path) + '_plugin.zip'
             dest = '%s/%s'%(DOWNLOADS, bname)
-            subprocess.check_call(['scp', f.name, dest])
+            subprocess.check_call(['scp', f.name, 'divok:'+dest])
 
     def run(self, opts):
         path = self.j(self.SRC, 'calibre', 'manual', 'plugin_examples')

src/calibre/ebooks/pdf/reflow.cpp

@@ -721,7 +721,7 @@ Reflow::render(int first_page, int last_page) {
     globalParams->setTextEncoding(encoding);
 
     int doc_pages = doc->getNumPages();
-    if (last_page < 1 or last_page > doc_pages) last_page = doc_pages;
+    if (last_page < 1 || last_page > doc_pages) last_page = doc_pages;
     if (first_page < 1) first_page = 1;
     if (first_page > last_page) first_page = last_page;