Fix a 64-bit error in ProgramBinary::load

ProgramBinary::save writes a size_t, so ProgramBinary::load needs to read it as the same type. Landed for jschuh. Original review: https://codereview.appspot.com/7304057/ Review URL: https://codereview.appspot.com/7310052 git-svn-id: https://angleproject.googlecode.com/svn/trunk@1825 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fix a 64-bit error in ProgramBinary::load
d64a53fe · apatrick@chromium.org · 70a76298 · d64a53fe · d64a53fe
Commit d64a53fe authored Feb 06, 2013 by apatrick@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

version.h src/common/version.h +1 -1

ProgramBinary.cpp src/libGLESv2/ProgramBinary.cpp +1 -1

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1824
+#define BUILD_REVISION 1825

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -1687,7 +1687,7 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length)
    stream.read(&mUsedPixelSamplerRange);
    stream.read(&mUsesPointSize);

-    unsigned int size;
+    size_t size;
    stream.read(&size);
    if (stream.error())
    {