Merge branch 'pr/n130_anshul1912'

Author: cfsmp3

linux/Makefile

@@ -42,11 +42,31 @@ INSTLALL_PROGRAM = $(INSTLALL)
 DESTDIR = /usr/bin
 
 ifeq ($(ENABLE_OCR),yes)
-CFLAGS+=-I/usr/local/include/tesseract -I/usr/local/include/leptonica
 CFLAGS+=-DENABLE_OCR
-LDFLAGS+= $(shell pkg-config --libs tesseract)
-LDFLAGS+= $(shell pkg-config --libs lept)
+TESS_LDFLAGS+= $(shell pkg-config --libs tesseract)
+LEPT_LDFLAGS+= $(shell pkg-config --libs lept)
+
+#error checking of library are there or not
+ifeq ($(TESS_LDFLAGS),$(EMPTY))
+$(error **ERROR** "tesseract not found")
+else
+#TODO print the version of library found
+$(info  "tesseract found")
 endif
+ifeq ($(LEPT_LDFLAGS),$(EMPTY))
+$(error **ERROR** "leptonica not found")
+else
+#TODO print the version of library found
+$(info  "Leptonica found")
+endif
+
+CFLAGS  += $(shell pkg-config --cflags tesseract)
+CFLAGS  += $(shell pkg-config --cflags lept)
+LDFLAGS += $(TESS_LDFLAGS)
+LDFLAGS += $(LEPT_LDFLAGS)
+endif
+
+
 ifeq ($(ENABLE_FFMPEG),yes)
 CFLAGS+=-DENABLE_FFMPEG
 CFLAGS+= $(shell pkg-config --cflags libavcodec)

src/lib_ccx/dvb_subtitle_decoder.c

@@ -435,6 +435,11 @@ void* dvbsub_init_decoder(struct dvb_config* cfg)
 
 #ifdef ENABLE_OCR
 	ctx->ocr_ctx = init_ocr(ctx->lang_index);
+        if(!ctx->ocr_ctx)
+	{
+		freep(&ctx);
+		return NULL;
+	}
 #endif
 	ctx->version = -1;
 

src/lib_ccx/ocr.c

@@ -67,7 +67,7 @@ static void delete_ocr (struct ocrCtx* ctx)
 {
         TessBaseAPIEnd(ctx->api);
         TessBaseAPIDelete(ctx->api);
-	freep(ctx);
+	freep(&ctx);
 }
 void* init_ocr(int lang_index)
 {