diff --git a/baseline/nonregression/opj_flower-minisblack-03-ENC-106.raw b/baseline/nonregression/opj_flower-minisblack-03-ENC-106.raw
new file mode 100644
index 0000000..4f66782
Binary files /dev/null and b/baseline/nonregression/opj_flower-minisblack-03-ENC-106.raw differ
diff --git a/baseline/nonregression/opj_flower-minisblack-05-ENC-107.raw b/baseline/nonregression/opj_flower-minisblack-05-ENC-107.raw
new file mode 100644
index 0000000..a427729
--- /dev/null
+++ b/baseline/nonregression/opj_flower-minisblack-05-ENC-107.raw
@@ -0,0 +1,132 @@
+
+
+
+	
+
+
+
+
+
+
+	
+


		
+
+	
+	
+
+
+
+







	
+			
+	
+



+	
+	
+





			
+	
+
+



			



+

	
	
+

+

+



+
+	




+


+	
+	
	
	







+		





+
+
+


	
+
+
+	

+

+	

+
		



+
+	

	


+			
+
+	

+

	
+			

+

	

	

	
+
+
+
+	
+
+	

+			

	
+
+			
+
+	
	
+
	

+
		

	
+
	




+	
+	

+


	
+	
+	



+





	
		
+
+

	
+
+		
+
+	
+
		
+
+
+

	
+
+	
	
	
+
+

		

	
+			


		
			


	
+
+
+
+
+		

+		


+
+	
	
+	
+
+
+			

	
+

+

	
+
+
	
+			
	
		
+			




+
+
+






+
	
+		
+			
+
+					
				
+

+

+		
+
+	











+							
+
+			
+
+




+
+		
+
+


+	
+						
\ No newline at end of file
diff --git a/baseline/nonregression/opj_flower-minisblack-07-ENC-108.raw b/baseline/nonregression/opj_flower-minisblack-07-ENC-108.raw
new file mode 100644
index 0000000..a231c95
--- /dev/null
+++ b/baseline/nonregression/opj_flower-minisblack-07-ENC-108.raw
@@ -0,0 +1,21 @@
++()'-)+(.,)4*,.*2.(92*71/9039335;;988;:<<?A==<<>?@==?A@??;==??><=?><A>8:<''))'(.%-0#2+)5*+6,/112545747:==89A>>@@?@A@=CEAACCAB?;AC>@@=@H?AEA>======%(&(-$(1"/,'0+-./004828A5?UB>:B@HNB@=HF@J??E?BCFBD<;IJ=???G?<A=><?<>=966>$#,"(- /*&-+..126<5:FA;GBc\AFIiukE9ADDDA>C=@C@CGB7@G@<98BA?<9898>A?@<:<%#&&#*'(*0.34>D;?GF@ELF@Co|~ZBj|z|{_;=?FC=DF<=@<??<;:56AC??BC<76?EE@=:8:@"#"%'%145;DF@HBCDEIGA;IH\_g}zWm{xzr|P=E@?@BC==>=>>99;EHB==7:?@EC;69;?E@=A#*.3>A=KLCJDGMLID<<ILBHNUX]d|m`q|rg~`@=3?NKE<5BMGB?><9?EFBDB:8>GGEDC@A@>?FIJKHD=CGIIHD>AAKK@:=JGJLXhgakdje]RigJ<&;NPIBA?AC=8@KNJC;<EJJIA<59CGGHLKGG<CJLIH?>:IPPE;>CKI@=<DLIGZmfOZXMJG$:X=)A<HNIA>GMH@?>@GLMG??BEHYdPF@93?JJCKJ@6IQM><Layh;9<GEEC@GKHBC]j9@JLK^(	?,!JA@FCFNKHFFB;@EFKNJEDFGRr|aikaKMF@CKQJJKD9BYtzmKOJDB>7BD?>B\O,7NIED
BGKC?<7;HPOE@EJEEKFCFKGG_yzuc=E4==CNLJIH_ixyN?JQSPGAA<9DH@;-UTJA5)7*':9<KOOKHGPF;FC@DLENost~s}rKDMNHE@6BNOcdZUua4@OQPF;83AONJE7:SNO#*GNOPA875/*/?' @HCHQI^npnu|m:?FHHONC>BRSQ\]]X?<=BO*'F;8HN>'!#9632"$@=9=66AIC94359A.=DCGKNSajtttSFLC;:IRLHPPKP[eI6.016BNA91",%!&JFJ4#J?=987?LNKJ66:5#*9I^lmqMAGDHC98EIJQXR*905)50#L<GC872&
	))($#;7.+73L@8.!,@FB$"6=8;CHbqrsMNKIHXk`JIMK9): &'4,;#!
+0NF>4	40!71)2D>3 .*%45$-K22%<?8ITUYmwpHJDEL`ng=;:*"3&HHROR99,."%%2)*3:%:60?,-FB)0/613<?SHQKTcE:@9EOailuLG6'+%#0
:DEDJ('OG3?-8W6/+$594(/,:>55(/67IFAJLG>?KIZRO_^W-=B
+$$,)*
+#FLNNQ+8&,AD.#* ,'7B4" ).&%420FC%=C>><ORMGCGNG#98$$5.&*,6)% #&%*!"
!*'-59A3&
+,)25$D8=?CLG@A@@@+8#(K'?1'..CD.?MIA;6*#6$
<G@C1;7?J;FC;9::7
+
-#37#
(
>30""/ANMLD(:9
)'5OJIH+:>86CI=9=5$+ 
	
 "%*( 8
5DFL<
+
D#<--5#C?2!+29/-"#5:4543>=7651$
8#%2&/31. 3#"#/!)!#(. 48'0+.@CEDDID@:2*"$%- !+/32+%$
#)"	%&)*+0=55<;KE@;20%!$*.($" -/-'47%,IJFA6"
#"%" !
+
 /1( 4")BDJ7 
+
#'

%"
 # 6
!%#! ")''IE$
+
( $
	
+%.%?<#%";
+

!!5#(
,-==5)!)"!#)( 
&$	

+,:$
+&

:2"$%/6:;9633/()/2.& 
	&
","/"(+)/,"%&'/551"! -'
+


"+/7",;FA/ *57


+			

%"/91+*/3/!#1@ILIDB>;43;:!%)&$

			
+
+
+
+
!128?GFC((5%.48<?<70,#&#




 &*-%'&/39;IF2>1
		


,485338:731-,*" CBIA>1"! !

+ ** /4689844116:1*	%(<@3!!,&""%)'%')+''#$  #'.4<2&',3593'""%'$!      $)07<@CC<3-).37AGC?B?<;91,'##"%$"" )+$(/2568869979856679;<;7;=<?AABE<3*'%$$$#%%#!!!      (30/1+'%'**.03537552-+('')*.2447;;<9=<<;;5+')('$#%&$##$$# ""
\ No newline at end of file
diff --git a/baseline/nonregression/opj_flower-minisblack-09-ENC-109.raw b/baseline/nonregression/opj_flower-minisblack-09-ENC-109.raw
new file mode 100644
index 0000000..fac1cbb
Binary files /dev/null and b/baseline/nonregression/opj_flower-minisblack-09-ENC-109.raw differ
diff --git a/baseline/nonregression/opj_flower-minisblack-11-ENC-110.raw b/baseline/nonregression/opj_flower-minisblack-11-ENC-110.raw
new file mode 100644
index 0000000..b98d911
Binary files /dev/null and b/baseline/nonregression/opj_flower-minisblack-11-ENC-110.raw differ
diff --git a/baseline/nonregression/opj_flower-minisblack-13-ENC-111.raw b/baseline/nonregression/opj_flower-minisblack-13-ENC-111.raw
new file mode 100644
index 0000000..d60eba4
Binary files /dev/null and b/baseline/nonregression/opj_flower-minisblack-13-ENC-111.raw differ
diff --git a/baseline/nonregression/opj_flower-minisblack-15-ENC-112.raw b/baseline/nonregression/opj_flower-minisblack-15-ENC-112.raw
new file mode 100644
index 0000000..ce48da2
Binary files /dev/null and b/baseline/nonregression/opj_flower-minisblack-15-ENC-112.raw differ
diff --git a/baseline/nonregression/opj_v2_flower-minisblack-03-ENC-106.txt b/baseline/nonregression/opj_v2_flower-minisblack-03-ENC-106.txt
new file mode 100644
index 0000000..66c226a
--- /dev/null
+++ b/baseline/nonregression/opj_v2_flower-minisblack-03-ENC-106.txt
@@ -0,0 +1,45 @@
+Image info {
+	 x0=0, y0=0
+	 x1=73, y1=43
+	 numcomps=1
+		 component 0 {
+		 dx=1, dy=1
+		 prec=3
+		 sgnd=0
+	}
+}
+Codestream info from main header: {
+	 tx0=0, ty0=0
+	 tdx=73, tdy=43
+	 tw=1, th=1
+	 default tile {
+		 csty=0
+		 prg=0
+		 numlayers=1
+		 mct=0
+		 comp 0 {
+			 csty=0
+			 numresolutions=6
+			 cblkw=2^6
+			 cblkh=2^6
+			 cblksty=0
+			 qmfbid=1
+			 preccintsize (w,h)=(15,15) (15,15) (15,15) (15,15) (15,15) (15,15) 
+			 qntsty=0
+			 numgbits=2
+			 stepsizes (m,e)=(0,3) (0,4) (0,4) (0,5) (0,4) (0,4) (0,5) (0,4) (0,4) (0,5) (0,4) (0,4) (0,5) (0,4) (0,4) (0,5) 
+			 roishift=0
+		 }
+	 }
+}
+Codestream index from main header: {
+	 Main header start position=85
+	 Main header end position=204
+	 Marker list: {
+		 type=0xff4f, pos=85, len=2
+		 type=0xff51, pos=87, len=43
+		 type=0xff52, pos=130, len=14
+		 type=0xff5c, pos=144, len=21
+		 type=0xff64, pos=165, len=39
+	 }
+}
diff --git a/baseline/nonregression/opj_v2_flower-minisblack-05-ENC-107.txt b/baseline/nonregression/opj_v2_flower-minisblack-05-ENC-107.txt
new file mode 100644
index 0000000..0b97e80
--- /dev/null
+++ b/baseline/nonregression/opj_v2_flower-minisblack-05-ENC-107.txt
@@ -0,0 +1,45 @@
+Image info {
+	 x0=0, y0=0
+	 x1=73, y1=43
+	 numcomps=1
+		 component 0 {
+		 dx=1, dy=1
+		 prec=5
+		 sgnd=0
+	}
+}
+Codestream info from main header: {
+	 tx0=0, ty0=0
+	 tdx=73, tdy=43
+	 tw=1, th=1
+	 default tile {
+		 csty=0
+		 prg=0
+		 numlayers=1
+		 mct=0
+		 comp 0 {
+			 csty=0
+			 numresolutions=6
+			 cblkw=2^6
+			 cblkh=2^6
+			 cblksty=0
+			 qmfbid=1
+			 preccintsize (w,h)=(15,15) (15,15) (15,15) (15,15) (15,15) (15,15) 
+			 qntsty=0
+			 numgbits=2
+			 stepsizes (m,e)=(0,5) (0,6) (0,6) (0,7) (0,6) (0,6) (0,7) (0,6) (0,6) (0,7) (0,6) (0,6) (0,7) (0,6) (0,6) (0,7) 
+			 roishift=0
+		 }
+	 }
+}
+Codestream index from main header: {
+	 Main header start position=85
+	 Main header end position=204
+	 Marker list: {
+		 type=0xff4f, pos=85, len=2
+		 type=0xff51, pos=87, len=43
+		 type=0xff52, pos=130, len=14
+		 type=0xff5c, pos=144, len=21
+		 type=0xff64, pos=165, len=39
+	 }
+}
diff --git a/baseline/nonregression/opj_v2_flower-minisblack-07-ENC-108.txt b/baseline/nonregression/opj_v2_flower-minisblack-07-ENC-108.txt
new file mode 100644
index 0000000..6936dec
--- /dev/null
+++ b/baseline/nonregression/opj_v2_flower-minisblack-07-ENC-108.txt
@@ -0,0 +1,45 @@
+Image info {
+	 x0=0, y0=0
+	 x1=73, y1=43
+	 numcomps=1
+		 component 0 {
+		 dx=1, dy=1
+		 prec=7
+		 sgnd=0
+	}
+}
+Codestream info from main header: {
+	 tx0=0, ty0=0
+	 tdx=73, tdy=43
+	 tw=1, th=1
+	 default tile {
+		 csty=0
+		 prg=0
+		 numlayers=1
+		 mct=0
+		 comp 0 {
+			 csty=0
+			 numresolutions=6
+			 cblkw=2^6
+			 cblkh=2^6
+			 cblksty=0
+			 qmfbid=1
+			 preccintsize (w,h)=(15,15) (15,15) (15,15) (15,15) (15,15) (15,15) 
+			 qntsty=0
+			 numgbits=2
+			 stepsizes (m,e)=(0,7) (0,8) (0,8) (0,9) (0,8) (0,8) (0,9) (0,8) (0,8) (0,9) (0,8) (0,8) (0,9) (0,8) (0,8) (0,9) 
+			 roishift=0
+		 }
+	 }
+}
+Codestream index from main header: {
+	 Main header start position=85
+	 Main header end position=204
+	 Marker list: {
+		 type=0xff4f, pos=85, len=2
+		 type=0xff51, pos=87, len=43
+		 type=0xff52, pos=130, len=14
+		 type=0xff5c, pos=144, len=21
+		 type=0xff64, pos=165, len=39
+	 }
+}
diff --git a/baseline/nonregression/opj_v2_flower-minisblack-09-ENC-109.txt b/baseline/nonregression/opj_v2_flower-minisblack-09-ENC-109.txt
new file mode 100644
index 0000000..8830ad2
--- /dev/null
+++ b/baseline/nonregression/opj_v2_flower-minisblack-09-ENC-109.txt
@@ -0,0 +1,45 @@
+Image info {
+	 x0=0, y0=0
+	 x1=73, y1=43
+	 numcomps=1
+		 component 0 {
+		 dx=1, dy=1
+		 prec=9
+		 sgnd=0
+	}
+}
+Codestream info from main header: {
+	 tx0=0, ty0=0
+	 tdx=73, tdy=43
+	 tw=1, th=1
+	 default tile {
+		 csty=0
+		 prg=0
+		 numlayers=1
+		 mct=0
+		 comp 0 {
+			 csty=0
+			 numresolutions=6
+			 cblkw=2^6
+			 cblkh=2^6
+			 cblksty=0
+			 qmfbid=1
+			 preccintsize (w,h)=(15,15) (15,15) (15,15) (15,15) (15,15) (15,15) 
+			 qntsty=0
+			 numgbits=2
+			 stepsizes (m,e)=(0,9) (0,10) (0,10) (0,11) (0,10) (0,10) (0,11) (0,10) (0,10) (0,11) (0,10) (0,10) (0,11) (0,10) (0,10) (0,11) 
+			 roishift=0
+		 }
+	 }
+}
+Codestream index from main header: {
+	 Main header start position=85
+	 Main header end position=204
+	 Marker list: {
+		 type=0xff4f, pos=85, len=2
+		 type=0xff51, pos=87, len=43
+		 type=0xff52, pos=130, len=14
+		 type=0xff5c, pos=144, len=21
+		 type=0xff64, pos=165, len=39
+	 }
+}
diff --git a/baseline/nonregression/opj_v2_flower-minisblack-11-ENC-110.txt b/baseline/nonregression/opj_v2_flower-minisblack-11-ENC-110.txt
new file mode 100644
index 0000000..3350d97
--- /dev/null
+++ b/baseline/nonregression/opj_v2_flower-minisblack-11-ENC-110.txt
@@ -0,0 +1,45 @@
+Image info {
+	 x0=0, y0=0
+	 x1=73, y1=43
+	 numcomps=1
+		 component 0 {
+		 dx=1, dy=1
+		 prec=11
+		 sgnd=0
+	}
+}
+Codestream info from main header: {
+	 tx0=0, ty0=0
+	 tdx=73, tdy=43
+	 tw=1, th=1
+	 default tile {
+		 csty=0
+		 prg=0
+		 numlayers=1
+		 mct=0
+		 comp 0 {
+			 csty=0
+			 numresolutions=6
+			 cblkw=2^6
+			 cblkh=2^6
+			 cblksty=0
+			 qmfbid=1
+			 preccintsize (w,h)=(15,15) (15,15) (15,15) (15,15) (15,15) (15,15) 
+			 qntsty=0
+			 numgbits=2
+			 stepsizes (m,e)=(0,11) (0,12) (0,12) (0,13) (0,12) (0,12) (0,13) (0,12) (0,12) (0,13) (0,12) (0,12) (0,13) (0,12) (0,12) (0,13) 
+			 roishift=0
+		 }
+	 }
+}
+Codestream index from main header: {
+	 Main header start position=85
+	 Main header end position=204
+	 Marker list: {
+		 type=0xff4f, pos=85, len=2
+		 type=0xff51, pos=87, len=43
+		 type=0xff52, pos=130, len=14
+		 type=0xff5c, pos=144, len=21
+		 type=0xff64, pos=165, len=39
+	 }
+}
diff --git a/baseline/nonregression/opj_v2_flower-minisblack-13-ENC-111.txt b/baseline/nonregression/opj_v2_flower-minisblack-13-ENC-111.txt
new file mode 100644
index 0000000..e70e3bd
--- /dev/null
+++ b/baseline/nonregression/opj_v2_flower-minisblack-13-ENC-111.txt
@@ -0,0 +1,45 @@
+Image info {
+	 x0=0, y0=0
+	 x1=73, y1=43
+	 numcomps=1
+		 component 0 {
+		 dx=1, dy=1
+		 prec=13
+		 sgnd=0
+	}
+}
+Codestream info from main header: {
+	 tx0=0, ty0=0
+	 tdx=73, tdy=43
+	 tw=1, th=1
+	 default tile {
+		 csty=0
+		 prg=0
+		 numlayers=1
+		 mct=0
+		 comp 0 {
+			 csty=0
+			 numresolutions=6
+			 cblkw=2^6
+			 cblkh=2^6
+			 cblksty=0
+			 qmfbid=1
+			 preccintsize (w,h)=(15,15) (15,15) (15,15) (15,15) (15,15) (15,15) 
+			 qntsty=0
+			 numgbits=2
+			 stepsizes (m,e)=(0,13) (0,14) (0,14) (0,15) (0,14) (0,14) (0,15) (0,14) (0,14) (0,15) (0,14) (0,14) (0,15) (0,14) (0,14) (0,15) 
+			 roishift=0
+		 }
+	 }
+}
+Codestream index from main header: {
+	 Main header start position=85
+	 Main header end position=204
+	 Marker list: {
+		 type=0xff4f, pos=85, len=2
+		 type=0xff51, pos=87, len=43
+		 type=0xff52, pos=130, len=14
+		 type=0xff5c, pos=144, len=21
+		 type=0xff64, pos=165, len=39
+	 }
+}
diff --git a/baseline/nonregression/opj_v2_flower-minisblack-15-ENC-112.txt b/baseline/nonregression/opj_v2_flower-minisblack-15-ENC-112.txt
new file mode 100644
index 0000000..3f9a11c
--- /dev/null
+++ b/baseline/nonregression/opj_v2_flower-minisblack-15-ENC-112.txt
@@ -0,0 +1,45 @@
+Image info {
+	 x0=0, y0=0
+	 x1=73, y1=43
+	 numcomps=1
+		 component 0 {
+		 dx=1, dy=1
+		 prec=15
+		 sgnd=0
+	}
+}
+Codestream info from main header: {
+	 tx0=0, ty0=0
+	 tdx=73, tdy=43
+	 tw=1, th=1
+	 default tile {
+		 csty=0
+		 prg=0
+		 numlayers=1
+		 mct=0
+		 comp 0 {
+			 csty=0
+			 numresolutions=6
+			 cblkw=2^6
+			 cblkh=2^6
+			 cblksty=0
+			 qmfbid=1
+			 preccintsize (w,h)=(15,15) (15,15) (15,15) (15,15) (15,15) (15,15) 
+			 qntsty=0
+			 numgbits=2
+			 stepsizes (m,e)=(0,15) (0,16) (0,16) (0,17) (0,16) (0,16) (0,17) (0,16) (0,16) (0,17) (0,16) (0,16) (0,17) (0,16) (0,16) (0,17) 
+			 roishift=0
+		 }
+	 }
+}
+Codestream index from main header: {
+	 Main header start position=85
+	 Main header end position=204
+	 Marker list: {
+		 type=0xff4f, pos=85, len=2
+		 type=0xff51, pos=87, len=43
+		 type=0xff52, pos=130, len=14
+		 type=0xff5c, pos=144, len=21
+		 type=0xff64, pos=165, len=39
+	 }
+}
diff --git a/input/nonregression/flower-minisblack-03.tif b/input/nonregression/flower-minisblack-03.tif
new file mode 100644
index 0000000..f40ead0
Binary files /dev/null and b/input/nonregression/flower-minisblack-03.tif differ
diff --git a/input/nonregression/flower-minisblack-05.tif b/input/nonregression/flower-minisblack-05.tif
new file mode 100644
index 0000000..c5dff47
Binary files /dev/null and b/input/nonregression/flower-minisblack-05.tif differ
diff --git a/input/nonregression/flower-minisblack-07.tif b/input/nonregression/flower-minisblack-07.tif
new file mode 100644
index 0000000..160bea7
Binary files /dev/null and b/input/nonregression/flower-minisblack-07.tif differ
diff --git a/input/nonregression/flower-minisblack-09.tif b/input/nonregression/flower-minisblack-09.tif
new file mode 100644
index 0000000..fb46fe3
Binary files /dev/null and b/input/nonregression/flower-minisblack-09.tif differ
diff --git a/input/nonregression/flower-minisblack-11.tif b/input/nonregression/flower-minisblack-11.tif
new file mode 100644
index 0000000..aaf8d94
Binary files /dev/null and b/input/nonregression/flower-minisblack-11.tif differ
diff --git a/input/nonregression/flower-minisblack-13.tif b/input/nonregression/flower-minisblack-13.tif
new file mode 100644
index 0000000..0da11f2
Binary files /dev/null and b/input/nonregression/flower-minisblack-13.tif differ
diff --git a/input/nonregression/flower-minisblack-15.tif b/input/nonregression/flower-minisblack-15.tif
new file mode 100644
index 0000000..294d223
Binary files /dev/null and b/input/nonregression/flower-minisblack-15.tif differ