test: Add some of JPEG 2000 tests

test/images/Makefile

@@ -8,6 +8,8 @@
  TYPES += gif
  TYPES += ico
  TYPES += jpg
+ TYPES += j2k
+ TYPES += jp2
  TYPES += jxl
 #TYPES += lbm
  TYPES += ilbm
@@ -25,8 +27,8 @@
 #TYPES += gz
 #TYPES += id3
 
-.PHONY: all imgs_64
-all: imgs_64
+.PHONY: all imgs_64 imgs_misc
+all: imgs_64 imgs_misc
 
  TYPES_64 = $(filter-out png, $(TYPES)) ff.bz2 ff.gz ff.xz # png.mp3
  ALL_64  = $(addprefix icon-64., $(TYPES_64))
@@ -34,6 +36,12 @@ all: imgs_64
 $(warning imgs_64=$(ALL_64))
 imgs_64:  $(ALL_64)
 
+ ALL_MISC  = icon-64-gray.jp2 icon-64-gray.j2k
+ ALL_MISC += xeyes.jp2 xeyes.j2k
+ ALL_MISC += xeyes-gray.png
+ ALL_MISC += xeyes-gray.jp2 xeyes-gray.j2k
+imgs_misc: $(ALL_MISC)
+
 %.argb: %.png
 	imlib2_conv $< $@
 
@@ -55,6 +63,15 @@ imgs_64:  $(ALL_64)
 %.jpg: %.png
 	convert $< $@
 
+%-gray.png: %.png
+	convert -colorspace Gray $< $@
+
+%.jp2: %.png
+	opj2_compress -i $< -o $@
+
+%.j2k: %.png
+	opj2_compress -i $< -o $@
+
 %.jxl: %.png
 	cjxl $< $@
 
@@ -107,4 +124,4 @@ imgs_64:  $(ALL_64)
 
 .PHONY: clean
 clean:
-	rm -f $(ALL_64)
+	rm -f $(ALL_64) $(ALL_MISC)

test/test_load.cpp

@@ -25,6 +25,10 @@ static const char  *const pfxs[] = {
    "ico",
    "jpg.mp3",                   // id3
    "jpg",
+#ifdef BUILD_J2K_LOADER
+   "jp2",
+   "j2k",
+#endif
 #ifdef BUILD_JXL_LOADER
    "jxl",
 #endif

test/test_load_2.cpp

@@ -39,10 +39,21 @@ static tii_t        tii[] = {
    { "icon-64.ilbm",		1153555547 },
    { "icon-64.jpg",		4132154843 },
    { "icon-64.jpg.mp3",		4132154843 },
+#ifdef BUILD_J2K_LOADER
+   { "icon-64.jp2",		 451428725 },
+   { "icon-64.j2k",		 451428725 },
+   { "xeyes.jp2",		2937827957 },
+   { "xeyes.j2k",		2937827957 },
+   { "icon-64-gray.jp2",	2437152898 },
+   { "icon-64-gray.j2k",	2437152898 },
+   { "xeyes-gray.jp2",		3377113384 },
+   { "xeyes-gray.j2k",		3377113384 },
+#endif
 #ifdef BUILD_JXL_LOADER
    { "icon-64.jxl",		 712907299 },
 #endif
    { "icon-64.png",		1153555547 },
+   { "xeyes-gray.png",		3493264608 },
    { "icon-64.ppm",		1153555547 },
    { "icon-64.pgm",		 140949526 },
    { "icon-64.pbm",		2153856013 },