Skip to content

Commit 7077e77

Browse files
committed
linux : fix camera-ffm.cpp
1 parent 10a33a0 commit 7077e77

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

native/linux/camera-ffm.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static int* getFrame_readFFM(FFMCamContext *ctx) {
326326
return ctx->px;
327327
}
328328

329-
jint* cameraGetFrame(FFMArrayInt ffm, jlong ctxptr)
329+
jint* cameraGetFrame(jlong ctxptr)
330330
{
331331
FFMCamContext *ctx = (FFMCamContext*)ctxptr;
332332
if (ctx == NULL) return NULL;
@@ -342,7 +342,7 @@ jint* cameraGetFrame(FFMArrayInt ffm, jlong ctxptr)
342342
if (img == NULL) return NULL;
343343

344344
int pxsize = ctx->width * ctx->height;
345-
jint *px = ffm.alloc(pxsize);
345+
jint *px = ffm->newIntArray(pxsize);
346346
jint *pxptr = px;
347347
memcpy(pxptr, img, pxsize * 4);
348348

@@ -366,11 +366,11 @@ jint cameraGetHeight(jlong ctxptr)
366366
extern "C" {
367367
JNIEXPORT jlong (*_cameraInit)() = &cameraInit;
368368
JNIEXPORT jboolean (*_cameraUninit)(jlong) = &cameraUninit;
369-
JNIEXPORT void* (*_cameraListDevices)(FFMArrayString, jlong) = &cameraListDevices;
370-
JNIEXPORT void* (*_cameraListModes)(FFMArrayString, jlong, jint) = &cameraListModes;
369+
JNIEXPORT void* (*_cameraListDevices)(jlong) = &cameraListDevices;
370+
JNIEXPORT void* (*_cameraListModes)(jlong, jint) = &cameraListModes;
371371
JNIEXPORT jboolean (*_cameraStart)(jlong , jint , jint , jint ) = &cameraStart;
372372
JNIEXPORT jboolean (*_cameraStop)(jlong) = &cameraStop;
373-
JNIEXPORT jint* (*_cameraGetFrame)(FFMArrayInt, jlong) = &cameraGetFrame;
373+
JNIEXPORT jint* (*_cameraGetFrame)(jlong) = &cameraGetFrame;
374374
JNIEXPORT jint (*_cameraGetWidth)(jlong) = &cameraGetWidth;
375375
JNIEXPORT jint (*_cameraGetHeight)(jlong) = &cameraGetHeight;
376376

0 commit comments

Comments
 (0)