You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
915 B
30 lines
915 B
2 years ago
|
commit 813d99d1241d251e78fce97c28d2533dbee8dae3
|
||
|
Author: Slávek Banko <slavek.banko@axis.cz>
|
||
|
Date: Wed Apr 27 20:07:36 2022 +0200
|
||
|
|
||
|
Add support for Jasper 3.x.
|
||
|
|
||
|
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
||
|
|
||
|
diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp
|
||
|
index 1f3f09c0..68075cf9 100644
|
||
|
--- a/kimgio/jp2.cpp
|
||
|
+++ b/kimgio/jp2.cpp
|
||
|
@@ -279,7 +279,16 @@ kimgio_jp2_write( TQImageIO* io )
|
||
|
TQTextStream ts( &rate, IO_WriteOnly );
|
||
|
ts << "rate="
|
||
|
<< ( (io->quality() < 0) ? DEFAULT_RATE : io->quality() / 100.0F );
|
||
|
+# if defined(JAS_VERSION_MAJOR) && (JAS_VERSION_MAJOR >= 3)
|
||
|
+ const jas_image_fmtinfo_t *jp2_fmtinfo = jas_image_lookupfmtbyname("jp2");
|
||
|
+ int i = -1;
|
||
|
+ if (jp2_fmtinfo)
|
||
|
+ {
|
||
|
+ i = jas_image_encode(ji, stream, jp2_fmtinfo->id, rate.utf8().data());
|
||
|
+ }
|
||
|
+# else
|
||
|
int i = jp2_encode( ji, stream, rate.utf8().data() );
|
||
|
+# endif
|
||
|
|
||
|
jas_image_destroy( ji );
|
||
|
jas_stream_close( stream );
|