Various build fixes.

[dcpomatic.git] / src / lib / poznan_encoder.h

diff --git a/src/lib/poznan_encoder.h b/src/lib/poznan_encoder.h
index 111161d02b202c142731ee7384813683d8df0ad1..6cdc5f0740ed85eb22c40dbb43b9c683d99d85ff 100644 (file)
--- a/src/lib/poznan_encoder.h
+++ b/src/lib/poznan_encoder.h
@@ -18,15 +18,15 @@
 */
 
 #include "jpeg2000_encoder.h"
-#include <poznan/config/parameters.h>
-#include <poznan/types/image_types.h>
+#include <poznan-jpeg2k-cth/config/parameters.h>
+#include <poznan-jpeg2k-cth/types/image_types.h>
 #include <string>
 
 class PoznanEncoder : public JPEG2000Encoder
 {
 public:
        PoznanEncoder ();
-       
+
        std::string name () const;
 
        std::string id () const {
@@ -35,22 +35,28 @@ public:
 
 protected:
 
-       boost::shared_ptr<EncodedData> do_encode (
-               boost::shared_ptr<const dcp::XYZImage> input,
-               dcp::NoteHandler note_handler
+       dcp::Data do_encode (
+               boost::shared_ptr<const dcp::OpenJPEGImage> input
                );
 
        void parameters_changed ();
-       
+
 private:
        void* open_library (std::string name);
-       
+
        type_parameters _param;
-       
+
        void (*_init_device) (type_parameters *);
-       void (*_mct) (type_image *, type_parameters *);
-       void (*_fwt) (type_tile *);     
-       void (*_quantize_tile) (type_tile *);   
-       void (*_encode_tile) (type_tile *);     
-       void (*_write_codestream) (type_image *);
+       void (*_color_coder_lossy) (type_image *);
+       void (*_fwt) (type_tile *);
+       void (*_quantize_tile) (type_tile *);
+       void (*_encode_tile) (type_tile *);
+       void (*_set_coding_parameters) (type_image *, type_parameters *);
+       void (*_init_tiles) (type_image **, type_parameters *);
+       void (*_init_buffer) (type_buffer *);
+       void (*_encode_codestream) (type_buffer *, type_image *);
+       void (*_cuda_h_allocate_mem) (void **, uint64_t);
+       void (*_cuda_memcpy_htd) (void *, void *, uint64_t);
+       void (*_cuda_h_free) (void *);
+       void (*_check_cuda_error) (char const *);
 };