diff options
| author | 2010-06-04 10:10:24 -0700 | |
|---|---|---|
| committer | 2010-06-04 10:10:24 -0700 | |
| commit | 0829f0d51f73b529a018b9afd931d01711db2f89 (patch) | |
| tree | 05b9677a884c74e3c1cb9cbc4050f59310aabd5e /libs/rs/rsAllocation.cpp | |
| parent | 4a575c682bae734338e1b8fd64886b0f29b960e4 (diff) | |
| parent | aae74ad6144470c66e72b075ac3afeddb186fa98 (diff) | |
Merge "Creating the jni and java layer to integrate a3d"
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
| -rw-r--r-- | libs/rs/rsAllocation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index 4db6a044a6cb..289cb307386b 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -348,8 +348,8 @@ void Allocation::serialize(OStream *stream) const Allocation *Allocation::createFromStream(Context *rsc, IStream *stream) { // First make sure we are reading the correct object - A3DClassID classID = (A3DClassID)stream->loadU32(); - if(classID != A3D_CLASS_ID_ALLOCATION) { + RsA3DClassID classID = (RsA3DClassID)stream->loadU32(); + if(classID != RS_A3D_CLASS_ID_ALLOCATION) { LOGE("allocation loading skipped due to invalid class id\n"); return NULL; } |