cstratak / rpms / blender

Forked from rpms/blender 3 years ago
Clone
Blob Blame History Raw
diff -up blender-2.66/source/blender/blenfont/intern/blf_translation.c.droid blender-2.66/source/blender/blenfont/intern/blf_translation.c
--- blender-2.66/source/blender/blenfont/intern/blf_translation.c.droid	2013-02-13 12:52:01.000000000 +0100
+++ blender-2.66/source/blender/blenfont/intern/blf_translation.c	2013-02-23 20:04:13.851326385 +0100
@@ -47,7 +47,7 @@
 
 #include "boost_locale_wrapper.h"
 
-static const char unifont_filename[] = "droidsans.ttf.gz";
+static const char unifont_filename[] = "DroidSans.ttf";
 static unsigned char *unifont_ttf = NULL;
 static int unifont_size = 0;
 #endif  /* WITH_INTERNATIONAL */
@@ -56,17 +56,10 @@ unsigned char *BLF_get_unifont(int *unif
 {
 #ifdef WITH_INTERNATIONAL
 	if (unifont_ttf == NULL) {
-		char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
-		if (fontpath) {
-			char unifont_path[1024];
-
-			BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename);
-
-			unifont_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_size);
-		}
-		else {
-			printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
-		}
+	  char *fontpath = "/usr/share/fonts/goggle-droid";
+	  char unifont_path[1024];
+  	  BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename);
+	  unifont_ttf = (unsigned char *)BLI_file_to_mem(unifont_path, &unifont_size);
 	}
 
 	*unifont_size_r = unifont_size;
diff -up blender-2.66/source/blender/blenlib/BLI_fileops.h.droid blender-2.66/source/blender/blenlib/BLI_fileops.h
--- blender-2.66/source/blender/blenlib/BLI_fileops.h.droid	2012-10-06 09:03:03.000000000 +0200
+++ blender-2.66/source/blender/blenlib/BLI_fileops.h	2013-02-23 19:55:54.818513899 +0100
@@ -81,6 +81,8 @@ int    BLI_file_touch(const char *file);
 int    BLI_file_gzip(const char *from, const char *to);
 char  *BLI_file_ungzip_to_mem(const char *from_file, int *size_r);
 
+char *BLI_file_to_mem(const char *from_file, int *size_r);
+
 size_t BLI_file_descriptor_size(int file);
 size_t BLI_file_size(const char *file);
 
diff -up blender-2.66/source/blender/blenlib/intern/fileops.c.droid blender-2.66/source/blender/blenlib/intern/fileops.c
--- blender-2.66/source/blender/blenlib/intern/fileops.c.droid	2013-02-11 01:49:00.000000000 +0100
+++ blender-2.66/source/blender/blenlib/intern/fileops.c	2013-02-23 19:55:54.821513746 +0100
@@ -155,6 +155,31 @@ char *BLI_file_ungzip_to_mem(const char
 	return mem;
 }
 
+char *BLI_file_to_mem(const char *from_file, int *size_r)
+{
+        int file;
+	int size = 0;
+	char *mem = NULL;
+
+	file = BLI_open(from_file, O_RDONLY, 0);
+
+	size = BLI_file_descriptor_size(file);
+       
+	if (size == 0) {
+	  close (file);
+	  return 0;
+	}
+      
+	mem = MEM_callocN(size, "BLI_ungzip_to_mem");
+		
+	read(file, mem, size);
+	
+	close (file);
+
+	*size_r = size;
+
+	return mem;
+}
 
 /* return 1 when file can be written */
 int BLI_file_is_writable(const char *filename)