Merge commit '086a541857812b2e0435db38fbabfddc7d19e53c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 22:43:06 +0000 (00:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 22:53:50 +0000 (00:53 +0200)
* commit '086a541857812b2e0435db38fbabfddc7d19e53c':
  fate: png-suite

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/image.mak
tests/ref/fate/png-gray16
tests/ref/fate/png-gray8
tests/ref/fate/png-rgb24
tests/ref/fate/png-rgb48
tests/ref/fate/png-rgba
tests/ref/fate/png-ya16
tests/ref/fate/png-ya8

@@@ -50,16 -50,28 +50,28 @@@ fate-exr-slice-pxr24: CMD = framecrc -
  
  FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR)
  
 -FATE_SAMPLES_AVCONV += $(FATE_EXR-yes)
 +FATE_IMAGE += $(FATE_EXR-yes)
  fate-exr: $(FATE_EXR-yes)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
 +FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
  fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
 -fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/libav_4x_concat.png -pix_fmt rgba
 +FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
 +fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba
  
 -fate-png-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/png1/libav_$(1).png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24
+ define FATE_IMGSUITE_PNG
+ FATE_PNG += fate-png-$(1)
 -FATE_SAMPLES_AVCONV += $(FATE_PNG-yes)
++fate-png-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/png1/lena-$(1).png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24
+ endef
+ PNG_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba ya8 ya16
+ $(foreach CLSP,$(PNG_COLORSPACES),$(eval $(call FATE_IMGSUITE_PNG,$(CLSP))))
+ FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG)
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
++FATE_IMAGE += $(FATE_PNG-yes)
+ fate-png: $(FATE_PNG-yes)
 +FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
  fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
  
  FATE_SGI += fate-sgi-gray
index 0000000,7bd73d8..66fc601
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,2 +1,2 @@@
 -0,          0,          0,        1,   203280, 0x56c92114
+ #tb 0: 1/25
++0,          0,          0,        1,    49152, 0xc71b77cd
index 0000000,5b30968..9d30db6
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,2 +1,2 @@@
 -0,          0,          0,        1,   203280, 0xe5df9033
+ #tb 0: 1/25
++0,          0,          0,        1,    49152, 0x55121b03
index 0000000,ed819ce..c383836
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,2 +1,2 @@@
 -0,          0,          0,        1,   203280, 0x57fff840
+ #tb 0: 1/25
++0,          0,          0,        1,    49152, 0xe0013dee
index 0000000,8bd0445..b1159f1
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,2 +1,2 @@@
 -0,          0,          0,        1,   203280, 0x764801bb
+ #tb 0: 1/25
++0,          0,          0,        1,    49152, 0xcf0e902a
index 0000000,eb473ce..f20fe0c
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,2 +1,2 @@@
 -0,          0,          0,        1,   203280, 0xb30c9da7
+ #tb 0: 1/25
++0,          0,          0,        1,    49152, 0x5017bc21
index 0000000,b932700..07906c4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,2 +1,2 @@@
 -0,          0,          0,        1,   203280, 0xf1b83aeb
+ #tb 0: 1/25
++0,          0,          0,        1,    49152, 0x93ce1cd5
index 0000000,9ce98f6..3a5c99d
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,2 +1,2 @@@
 -0,          0,          0,        1,   203280, 0xe77c008e
+ #tb 0: 1/25
++0,          0,          0,        1,    49152, 0xed73bf03