am 315c8a38: am d90222ba: Merge "Adding Bytebuffer support to rastermill library"

* commit '315c8a384c4ca2a5670b9eed407caa5dea6c1ce0':
  Adding Bytebuffer support to rastermill library

1 files changed, 19 insertions, 8 deletions

diff --git a/framesequence/jni/Registry.cpp b/framesequence/jni/Registry.cpp
index 125ac66..e632bb2 100644
--- a/framesequence/jni/Registry.cpp
+++ b/framesequence/jni/Registry.cpp
@@ -34,15 +34,26 @@ Registry::Registry(const RegistryEntry& entry) {
 
 const RegistryEntry* Registry::Find(Stream* stream) {
     Registry* registry = gHead;
-    int headerSize = gHeaderBytesRequired;
-    char header[headerSize];
-    headerSize = stream->peek(header, headerSize);
-    while (registry) {
-        if (headerSize >= registry->mImpl.requiredHeaderBytes
-                && registry->mImpl.checkHeader(header, headerSize)) {
-            return &(registry->mImpl);
+
+    if (stream->getRawBuffer() != NULL) {
+        while (registry) {
+            if (registry->mImpl.acceptsBuffer()) {
+                return &(registry->mImpl);
+            }
+            registry = registry->mNext;
+        }
+    } else {
+        int headerSize = gHeaderBytesRequired;
+        char header[headerSize];
+        headerSize = stream->peek(header, headerSize);
+        while (registry) {
+            if (headerSize >= registry->mImpl.requiredHeaderBytes
+                    && registry->mImpl.checkHeader(header, headerSize)) {
+                return &(registry->mImpl);
+            }
+            registry = registry->mNext;
         }
-        registry = registry->mNext;
     }
     return 0;
 }
+