More C like file naming

HaarigerHarald · HaarigerHarald · commit 7284605d4585 · 2015-08-20T16:25:57.000+02:00
diff --git a/HttpImage.c b/HttpImage.c
diff --git a/HttpImage.h b/HttpImage.h
diff --git a/Makefile b/Makefile
@@ -1,10 +1,9 @@
-OBJS=omxiv.o OmxImage.o OmxRender.o SoftImage.o ./libnsbmp/libnsbmp.o
+OBJS=omxiv.o omx_image.o omx_render.o soft_image.o ./libnsbmp/libnsbmp.o
 BIN=omxiv.bin
 LDFLAGS+=-lilclient -ljpeg -lpng
 INCLUDES+=-I./libnsbmp -I./libs/ilclient
 
 ifneq ($(CURL),0)
-OBJS+= HttpImage.o
 LDFLAGS+= -lcurl
 CFLAGS+= -DUSE_LIBCURL
 endif
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@ A GPU accelerated image viewer for the Raspberry Pi.
 
 ## Building
 
-Make sure that you have the development header for libjpeg, libpng and optional 
-libcurl installed (libjpeg8-dev, libpng12-dev, libcurl4-openssl-dev), then build 
-it on the Pi with:
+You will need the development header for libjpeg, libpng and optional 
+libcurl (Debian: libjpeg8-dev, libpng12-dev, libcurl4-openssl-dev). 
+Then build it on the Pi with:
 
     make ilclient
     make
@@ -35,6 +35,5 @@ And install with:
 ##### Thanks to:
   * Matt Ownby, Anthong Sale for their hello_jpeg example
   * Jan Newmarch for his [blog](http://jan.newmarch.name/RPi/index.html): Programming AudioVideo on the Raspberry Pi GPU
-  * The xbmc/kodi guys for their omxplayer
-  * Everyone else I might have forgotten
+  * Various authors of example code and other parts (marked in the source files)
 
diff --git a/image_def.h b/image_def.h
@@ -17,4 +17,4 @@ typedef struct IMAGE{
 	char colorSpace; 
 } IMAGE;
 
-#endif
+#endif
diff --git a/omx_image.c b/omx_image.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <pthread.h>
 
-#include "OmxImage.h"
+#include "omx_image.h"
 #include "bcm_host.h"
 
 #define TIMEOUT_MS 1500
@@ -162,7 +162,7 @@ static int startupDecoder(JPEG_DECODER * decoder){
 		if (OMX_AllocateBuffer(decoder->handle,
 					&decoder->ppInputBufferHeader[i],
 					decoder->inPort,
-					(void *) i, portdef.nBufferSize) != OMX_ErrorNone) {
+					NULL, portdef.nBufferSize) != OMX_ErrorNone) {
 			return OMX_JPEG_ERROR_MEMORY;
 		}
 	}
diff --git a/omx_image.h b/omx_image.h
@@ -26,7 +26,7 @@
  */
 
 #include "ilclient.h"
-#include "ImageDef.h"
+#include "image_def.h"
 
 #define OMX_JPEG_OK 0x0
 #define OMX_JPEG_ERROR_MEMORY  0x1
diff --git a/omx_render.c b/omx_render.c
@@ -27,7 +27,7 @@
 
 #include <stdlib.h>
 
-#include "OmxRender.h"
+#include "omx_render.h"
 #include "bcm_host.h"
 
 #define TIMEOUT_MS 2000
diff --git a/omx_render.h b/omx_render.h
@@ -25,7 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ImageDef.h"
+#include "image_def.h"
 #include "ilclient.h"
 
 #define OMX_RENDER_OK 0x0
diff --git a/omxiv.c b/omxiv.c
@@ -9,10 +9,9 @@
 #include <signal.h>
 #include <dirent.h>
 
-#include "OmxRender.h"
-#include "OmxImage.h"
-#include "SoftImage.h"
-#include "HttpImage.h"
+#include "omx_render.h"
+#include "omx_image.h"
+#include "soft_image.h"
 #include "bcm_host.h"
 
 #define str(s) #s
diff --git a/soft_image.c b/soft_image.c
@@ -1,10 +1,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <jpeglib.h>
 #include <png.h>
 
-#include "SoftImage.h"
+#include "soft_image.h"
 #include "libnsbmp/libnsbmp.h"
 
 struct my_error_mgr {
@@ -329,3 +330,72 @@ int softDecodeBMP(FILE *fp, IMAGE* bmpImage){
 	return ret;
 }
 
+#ifdef USE_LIBCURL
+
+/**
+ * Modified from: http://curl.haxx.se/libcurl/c/getinmemory.html 
+ * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Distributed under: http://curl.haxx.se/docs/copyright.html
+**/
+
+#include <curl/curl.h>
+
+struct MemoryStruct {
+	char *memory;
+	size_t size;
+};
+
+static size_t WriteMemoryCallback(void *contents, size_t size, size_t nmemb, void *userp)
+{
+	size_t realsize = size * nmemb;
+	struct MemoryStruct *mem = (struct MemoryStruct *)userp;
+
+	mem->memory = realloc(mem->memory, mem->size + realsize);
+	if(!mem->memory) {
+		return 0;
+	}
+
+	memcpy(&(mem->memory[mem->size]), contents, realsize);
+	mem->size += realsize;
+
+	return realsize;
+}
+
+char* getImageFromUrl(const char *url, size_t *size){
+	CURL *curl_handle;
+	CURLcode res;
+
+	struct MemoryStruct chunk;
+
+	chunk.memory = NULL;
+	chunk.size = 0;
+
+	curl_global_init(CURL_GLOBAL_ALL);
+
+	curl_handle = curl_easy_init();
+
+	curl_easy_setopt(curl_handle, CURLOPT_URL, url);
+
+	curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
+
+	curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)&chunk);
+
+	curl_easy_setopt(curl_handle, CURLOPT_USERAGENT, "libcurl-agent/1.0");
+
+	res = curl_easy_perform(curl_handle);
+
+	if(res != CURLE_OK) {
+		free(chunk.memory);
+		chunk.memory=NULL;
+		chunk.size = 0;
+		printf("libCurl returned error code %d\n", res);
+	}
+	
+	*size= chunk.size;
+
+	curl_easy_cleanup(curl_handle);
+	curl_global_cleanup();
+	
+	return chunk.memory;
+}
+#endif	
diff --git a/soft_image.h b/soft_image.h
@@ -1,4 +1,4 @@
-#include "ImageDef.h"
+#include "image_def.h"
 
 #define SOFT_IMAGE_ERROR_FILE_OPEN 0x02
 
@@ -32,3 +32,7 @@ int softDecodePng(FILE *pngFile, IMAGE* png);
 #define SOFT_BMP_ERROR_ANALYSING 0x08
 
 int softDecodeBMP(FILE *bmpFile, IMAGE* bmpImage);
+
+/* Get Image from Url */
+char* getImageFromUrl(const char *url, size_t *size);
+
