Commit 303b9f03 authored by Frank Barchard's avatar Frank Barchard

Avoid gcc 4.4 indexing a vector_size(32) array error.

Mking color conversion use simple arrays within structure, which will be referenced via register pointer.

R=harryjin@google.com
BUG=libyuv:616
TEST=CC=gcc-4.4 CXX=g++-4.4 LD=ld-4.4 make -f linux.mk

Review URL: https://codereview.chromium.org/2127863003 .
parent 2f101fdb
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 1602 Version: 1603
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
...@@ -441,13 +441,13 @@ struct YuvConstants { ...@@ -441,13 +441,13 @@ struct YuvConstants {
#else #else
// This struct is for Intel color conversion. // This struct is for Intel color conversion.
struct YuvConstants { struct YuvConstants {
lvec8 kUVToB; int8 kUVToB[32];
lvec8 kUVToG; int8 kUVToG[32];
lvec8 kUVToR; int8 kUVToR[32];
lvec16 kUVBiasB; int16 kUVBiasB[16];
lvec16 kUVBiasG; int16 kUVBiasG[16];
lvec16 kUVBiasR; int16 kUVBiasR[16];
lvec16 kYToRgb; int16 kYToRgb[16];
}; };
// Offsets into YuvConstants structure // Offsets into YuvConstants structure
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1602 #define LIBYUV_VERSION 1603
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
...@@ -75,7 +75,7 @@ psnr: util/psnr.cc ...@@ -75,7 +75,7 @@ psnr: util/psnr.cc
# A C test utility that uses libyuv conversion from C. # A C test utility that uses libyuv conversion from C.
cpuid: util/cpuid.c libyuv.a cpuid: util/cpuid.c libyuv.a
$(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a -lc++
clean: clean:
/bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment