Another Windows build fix.

[dcpomatic.git] / src / lib / j2k_image_proxy.cc

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 707a088e90f468bd219dfa853624cf03153a3d25..eea4b038a2c841861a5799288bb216cb7ee9cafc 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -30,12 +30,14 @@
 #include <dcp/j2k.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <Magick++.h>
 #include <iostream>
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
+using std::max;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
@@ -91,41 +93,47 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
        socket->read (_data.data().get (), _data.size ());
 }
 
-void
-J2KImageProxy::ensure_j2k () const
-{
-       if (!_j2k) {
-               _j2k = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
-       }
-}
-
 shared_ptr<Image>
-J2KImageProxy::image (optional<dcp::NoteHandler>) const
+J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
 {
-       ensure_j2k ();
-
-       if (_j2k->precision(0) < 12) {
-               int const shift = 12 - _j2k->precision (0);
-               for (int c = 0; c < 3; ++c) {
-                       int* p = _j2k->data (c);
-                       for (int y = 0; y < _j2k->size().height; ++y) {
-                               for (int x = 0; x < _j2k->size().width; ++x) {
-                                       *p++ <<= shift;
+       if (!_j2k || target_size != _j2k_target_size) {
+               int reduce = 0;
+
+               while (target_size && (_size.width / pow(2, reduce)) > target_size->width && (_size.height / pow(2, reduce)) > target_size->height) {
+                       ++reduce;
+               }
+
+               --reduce;
+               reduce = max (0, reduce);
+               _j2k = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
+
+               if (_j2k->precision(0) < 12) {
+                       int const shift = 12 - _j2k->precision (0);
+                       for (int c = 0; c < 3; ++c) {
+                               int* p = _j2k->data (c);
+                               for (int y = 0; y < _j2k->size().height; ++y) {
+                                       for (int x = 0; x < _j2k->size().width; ++x) {
+                                               *p++ <<= shift;
+                                       }
                                }
                        }
                }
+
+               _j2k_target_size = target_size;
        }
 
-       shared_ptr<Image> image (new Image (_pixel_format, _size, true));
+       shared_ptr<Image> image (new Image (_pixel_format, _j2k->size(), true));
 
        /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
           the data is 12-bit either way.
        */
 
+       int const width = _j2k->size().width;
+
        int p = 0;
        for (int y = 0; y < _j2k->size().height; ++y) {
                uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]);
-               for (int x = 0; x < _j2k->size().width; ++x) {
+               for (int x = 0; x < width; ++x) {
                        for (int c = 0; c < 3; ++c) {
                                *q++ = _j2k->data(c)[p] << 4;
                        }
@@ -143,7 +151,7 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const
        node->add_child("Width")->add_child_text (raw_convert<string> (_size.width));
        node->add_child("Height")->add_child_text (raw_convert<string> (_size.height));
        if (_eye) {
-               node->add_child("Eye")->add_child_text (raw_convert<string> (_eye.get ()));
+               node->add_child("Eye")->add_child_text (raw_convert<string> (static_cast<int> (_eye.get ())));
        }
        node->add_child("Size")->add_child_text (raw_convert<string> (_data.size ()));
 }