X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fplugins%2Ftitler%2Ftitle.C;h=8ccdb2a3648bfa19b28afd2cfe45454a463bdde5;hb=310cfd249d955850c39757d80e07949ad4fef205;hp=9974c91ab481ab0e6dec24dd5e6aa5e077b28973;hpb=f9d0d999e813ae19965e07ae2f7da690b4e6fe45;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/plugins/titler/title.C b/cinelerra-5.0/plugins/titler/title.C
index 9974c91a..8ccdb2a3 100644
--- a/cinelerra-5.0/plugins/titler/title.C
+++ b/cinelerra-5.0/plugins/titler/title.C
@@ -818,7 +818,6 @@ LoadPackage* TitleOutlineEngine::new_package()
 
 
 
-
 TitleTranslatePackage::TitleTranslatePackage()
  : LoadPackage()
 {
@@ -850,7 +849,6 @@ void TitleTranslate::run_packages()
 
 
 
-
 #define TRANSLATE(type, max, components, ofs) \
 { \
 	unsigned char **in_rows = plugin->text_mask->get_rows(); \
@@ -1205,10 +1203,12 @@ void TitleMain::build_previews(TitleWindow *gui)
 			for(int j = 0; j < len; j++)
 			{
 				FT_ULong c = test_string[j];
-				check_char_code_path(freetype_library,
-					font_entry->path,
-					c,
-					(char *)new_path);
+// memory leaks here are fatal
+//				check_char_code_path(freetype_library,
+//					font_entry->path,
+//					c,
+//					(char *)new_path);
+				strcpy(new_path, font_entry->path);
 				if( !load_freetype_face(freetype_library,
 					freetype_face, new_path)) {
 					FT_Set_Pixel_Sizes(freetype_face, text_height, 0);
@@ -1216,11 +1216,11 @@ void TitleMain::build_previews(TitleWindow *gui)
 					if(!FT_Load_Char(freetype_face, c, FT_LOAD_RENDER)) {
 						if(pass == 0) {
 							current_w = current_x + freetype_face->glyph->bitmap.width;
-							if(freetype_face->glyph->bitmap_top > current_ascent)
+							if((int)freetype_face->glyph->bitmap_top > current_ascent)
 								current_ascent = freetype_face->glyph->bitmap_top;
-							if(freetype_face->glyph->bitmap.rows > total_h)
+							if((int)freetype_face->glyph->bitmap.rows > total_h)
 								total_h = freetype_face->glyph->bitmap.rows;
-							if(freetype_face->glyph->bitmap.rows > current_h)
+							if((int)freetype_face->glyph->bitmap.rows > current_h)
 								current_h = freetype_face->glyph->bitmap.rows;
 						}
 						else {
@@ -1229,7 +1229,7 @@ void TitleMain::build_previews(TitleWindow *gui)
 							int out_y = (total_h - height[font_number]) / 2 +
 								ascent[font_number] - freetype_face->glyph->bitmap_top;
 							for(int in_y = 0;
-								in_y < freetype_face->glyph->bitmap.rows &&
+								in_y < (int)freetype_face->glyph->bitmap.rows &&
 									out_y < total_h;
 								in_y++, out_y++) {
 								unsigned char *out_row = font_entry->image->get_rows()[out_y] +
@@ -1237,7 +1237,7 @@ void TitleMain::build_previews(TitleWindow *gui)
 								unsigned char *in_row = freetype_face->glyph->bitmap.buffer +
 									freetype_face->glyph->bitmap.pitch * in_y;
 
-								for(int out_x = 0; out_x < freetype_face->glyph->bitmap.width &&
+								for(int out_x = 0; out_x < (int)freetype_face->glyph->bitmap.width &&
 									out_x < total_w;
 									out_x++) {
 									*out_row = (*in_row * r +
@@ -1303,7 +1303,7 @@ int TitleMain::check_char_code_path(FT_Library &freetype_library,
 	{
 		FT_Set_Pixel_Sizes(temp_freetype_face, 128, 0);
 		int gindex = FT_Get_Char_Index(temp_freetype_face, char_code);
-		if((!gindex == 0) && (!char_code != 10))
+		if( gindex != 0 && char_code == 10 )
 		{
 			strcpy(path_new, path_old);
 			notfindit = 0;
@@ -1329,7 +1329,7 @@ int TitleMain::check_char_code_path(FT_Library &freetype_library,
 					{
 						FT_Set_Pixel_Sizes(temp_freetype_face, 128, 0);
 						int gindex = FT_Get_Char_Index(temp_freetype_face, char_code);
-						if((!gindex == 0) && (!char_code != 10))
+						if( gindex != 0 && char_code == 10 )
 						{
 							sprintf(path_new, "%s", tmpstring);
 							notfindit = 0;