From d1ac257658c4254afbd960740cba4181069bddfa Mon Sep 17 00:00:00 2001
From: simon987 <me@simon987.net>
Date: Mon, 3 Aug 2020 19:15:12 -0400
Subject: [PATCH] CSS tweaks, fix #87

---
 libscan/ebook/ebook.c | 27 +++++++++++++--------------
 libscan/media/media.c |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/libscan/ebook/ebook.c b/libscan/ebook/ebook.c
index 407ceb9..dd8a831 100644
--- a/libscan/ebook/ebook.c
+++ b/libscan/ebook/ebook.c
@@ -42,14 +42,14 @@ int render_cover(scan_ebook_ctx_t *ctx, fz_context *fzctx, document_t *doc, fz_d
     if (err != 0) {
         fz_drop_page(fzctx, cover);
         CTX_LOG_WARNINGF(doc->filepath, "fz_load_page() returned error code [%d] %s", err, fzctx->error.message)
-        return -1;
+        return FALSE;
     }
 
     fz_rect bounds = fz_bound_page(fzctx, cover);
 
     float scale;
-    float w = (float) bounds.x1 - bounds.x0;
-    float h = (float) bounds.y1 - bounds.y0;
+    float w = bounds.x1 - bounds.x0;
+    float h = bounds.y1 - bounds.y0;
     if (w > h) {
         scale = (float) ctx->tn_size / w;
     } else {
@@ -81,14 +81,14 @@ int render_cover(scan_ebook_ctx_t *ctx, fz_context *fzctx, document_t *doc, fz_d
         CTX_LOG_WARNINGF(doc->filepath, "fz_run_page() returned error code [%d] %s", err, fzctx->error.message)
         fz_drop_page(fzctx, cover);
         fz_drop_pixmap(fzctx, pixmap);
-        return -1;
+        return FALSE;
     }
 
     if (pixmap->n != 3) {
         CTX_LOG_ERRORF(doc->filepath, "Got unexpected pixmap depth: %d", pixmap->n)
         fz_drop_page(fzctx, cover);
         fz_drop_pixmap(fzctx, pixmap);
-        return -1;
+        return FALSE;
     }
 
     // RGB24 -> YUV420p
@@ -96,7 +96,7 @@ int render_cover(scan_ebook_ctx_t *ctx, fz_context *fzctx, document_t *doc, fz_d
 
     struct SwsContext *sws_ctx= sws_getContext(
             pixmap->w, pixmap->h, AV_PIX_FMT_RGB24,
-            pixmap->w, pixmap->h, AV_PIX_FMT_YUVJ420P,
+            pixmap->w, pixmap->h, AV_PIX_FMT_YUV420P,
             SIST_SWS_ALGO, 0, 0, 0
     );
 
@@ -139,7 +139,7 @@ int render_cover(scan_ebook_ctx_t *ctx, fz_context *fzctx, document_t *doc, fz_d
     fz_drop_pixmap(fzctx, pixmap);
     fz_drop_page(fzctx, cover);
 
-    return 0;
+    return TRUE;
 }
 
 void fz_err_callback(void *user, const char *message) {
@@ -300,15 +300,14 @@ void parse_ebook_mem(scan_ebook_ctx_t *ctx, void* buf, size_t buf_len, const cha
     }
 
     if (ctx->tn_size > 0) {
-        err = render_cover(ctx, fzctx, doc, fzdoc);
+        if (render_cover(ctx, fzctx, doc, fzdoc) == FALSE) {
+            fz_drop_stream(fzctx, stream);
+            fz_drop_document(fzctx, fzdoc);
+            fz_drop_context(fzctx);
+            return;
+        }
     }
 
-    if (err != 0) {
-        fz_drop_stream(fzctx, stream);
-        fz_drop_document(fzctx, fzdoc);
-        fz_drop_context(fzctx);
-        return;
-    }
 
     if (ctx->content_size > 0) {
         fz_stext_options opts = {0};
diff --git a/libscan/media/media.c b/libscan/media/media.c
index 01c9689..2348745 100644
--- a/libscan/media/media.c
+++ b/libscan/media/media.c
@@ -21,7 +21,7 @@ void *scale_frame(const AVCodecContext *decoder, const AVFrame *frame, int size)
     int dstW;
     int dstH;
     if (frame->width <= size && frame->height <= size) {
-        if (decoder->pix_fmt == AV_PIX_FMT_YUV420P || decoder->pix_fmt == AV_PIX_FMT_YUVJ420P) {
+        if (decoder->codec_id == AV_CODEC_ID_MJPEG || decoder->codec_id == AV_CODEC_ID_PNG) {
             return STORE_AS_IS;
         }