update to new api interface for NLT

michaeldsmith · michaeldsmith · commit b7f9ea793ee7 · 2025-01-20T07:08:49.000-08:00
diff --git a/src/apps/ojph_compress/ojph_compress.cpp b/src/apps/ojph_compress/ojph_compress.cpp
@@ -936,10 +936,12 @@ int main(int argc, char * argv[]) {
 
           }
           if (all_the_same)
-            nlt.set_type3_transformation(ojph::param_nlt::ALL_COMPS, true);
+            nlt.set_nonlinear_transform(ojph::param_nlt::ALL_COMPS, 
+              ojph::param_nlt::OJPH_NLT_BINARY_COMPLEMENT_NLT);
           else
             for (ojph::ui32 c = 0; c < num_comps; ++c)
-              nlt.set_type3_transformation(c, true);
+              nlt.set_nonlinear_transform(c, 
+                ojph::param_nlt::OJPH_NLT_BINARY_COMPLEMENT_NLT);
         }
 
         if (dims.w != 0 || dims.h != 0)
diff --git a/src/apps/ojph_expand/ojph_expand.cpp b/src/apps/ojph_expand/ojph_expand.cpp
@@ -355,7 +355,8 @@ int main(int argc, char *argv[]) {
           is_signeds[c] = siz.is_signed(c);
           bool nlt_is_signed;
           ojph::ui8 nlt_bit_depth;
-          has_nlt_type3[c] = nlt.get_type3_transformation(c, nlt_bit_depth, nlt_is_signed);
+          ojph::ui8 nl_type;
+          has_nlt_type3[c] = nlt.get_nonlinear_transform(c, nlt_bit_depth, nlt_is_signed, nl_type);
 
           if (true == has_nlt_type3[c] && (nlt_bit_depth != siz.get_bit_depth(c) || nlt_is_signed != siz.is_signed(c)))
           {

Original file line number	Diff line number	Diff line change
`@@ -936,10 +936,12 @@ int main(int argc, char * argv[]) {`
`936`	`936`
`937`	`937`	`}`
`938`	`938`	`if (all_the_same)`
`939`		`- nlt.set_type3_transformation(ojph::param_nlt::ALL_COMPS, true);`
	`939`	`+ nlt.set_nonlinear_transform(ojph::param_nlt::ALL_COMPS,`
	`940`	`+ ojph::param_nlt::OJPH_NLT_BINARY_COMPLEMENT_NLT);`
`940`	`941`	`else`
`941`	`942`	`for (ojph::ui32 c = 0; c < num_comps; ++c)`
`942`		`- nlt.set_type3_transformation(c, true);`
	`943`	`+ nlt.set_nonlinear_transform(c,`
	`944`	`+ ojph::param_nlt::OJPH_NLT_BINARY_COMPLEMENT_NLT);`
`943`	`945`	`}`
`944`	`946`
`945`	`947`	`if (dims.w != 0 \|\| dims.h != 0)`
Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,8 @@ int main(int argc, char *argv[]) {`
`355`	`355`	`is_signeds[c] = siz.is_signed(c);`
`356`	`356`	`bool nlt_is_signed;`
`357`	`357`	`ojph::ui8 nlt_bit_depth;`
`358`		`- has_nlt_type3[c] = nlt.get_type3_transformation(c, nlt_bit_depth, nlt_is_signed);`
	`358`	`+ ojph::ui8 nl_type;`
	`359`	`+ has_nlt_type3[c] = nlt.get_nonlinear_transform(c, nlt_bit_depth, nlt_is_signed, nl_type);`
`359`	`360`
`360`	`361`	`if (true == has_nlt_type3[c] && (nlt_bit_depth != siz.get_bit_depth(c) \|\| nlt_is_signed != siz.is_signed(c)))`
`361`	`362`	`{`