mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Now avoiding the memcpy() call in cGlyph::cGlyph() if the bitmap is empty
This commit is contained in:
		@@ -2206,6 +2206,7 @@ Marko M
 | 
				
			|||||||
 for reporting a flaw in initializing cDvbPlayerControl and cTransferControl
 | 
					 for reporting a flaw in initializing cDvbPlayerControl and cTransferControl
 | 
				
			||||||
 for reporting a possible call to poll() in cSectionHandler::Action() without any
 | 
					 for reporting a possible call to poll() in cSectionHandler::Action() without any
 | 
				
			||||||
 filters
 | 
					 filters
 | 
				
			||||||
 | 
					 for avoiding the memcpy() call in cGlyph::cGlyph() if the bitmap is empty
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Patrick Rother <krd-vdr@gulu.net>
 | 
					Patrick Rother <krd-vdr@gulu.net>
 | 
				
			||||||
 for reporting a bug in defining timers that only differ in the day of week
 | 
					 for reporting a bug in defining timers that only differ in the day of week
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							@@ -9826,3 +9826,5 @@ Video Disk Recorder Revision History
 | 
				
			|||||||
- Fixed initializing cDvbPlayerControl and cTransferControl (reported by Marko M<>kel<65>).
 | 
					- Fixed initializing cDvbPlayerControl and cTransferControl (reported by Marko M<>kel<65>).
 | 
				
			||||||
- Now avoiding calling poll() in cSectionHandler::Action() if there are no filters
 | 
					- Now avoiding calling poll() in cSectionHandler::Action() if there are no filters
 | 
				
			||||||
  (reported by Marko M<>kel<65>).
 | 
					  (reported by Marko M<>kel<65>).
 | 
				
			||||||
 | 
					- Now avoiding the memcpy() call in cGlyph::cGlyph() if the bitmap is empty (thanks
 | 
				
			||||||
 | 
					  to Marko M<>kel<65>).
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										5
									
								
								font.c
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								font.c
									
									
									
									
									
								
							@@ -6,7 +6,7 @@
 | 
				
			|||||||
 *
 | 
					 *
 | 
				
			||||||
 * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
 | 
					 * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * $Id: font.c 5.1 2021/12/20 13:19:52 kls Exp $
 | 
					 * $Id: font.c 5.2 2022/12/06 12:30:13 kls Exp $
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "font.h"
 | 
					#include "font.h"
 | 
				
			||||||
@@ -74,7 +74,8 @@ cGlyph::cGlyph(uint CharCode, FT_GlyphSlotRec_ *GlyphData)
 | 
				
			|||||||
  rows = GlyphData->bitmap.rows;
 | 
					  rows = GlyphData->bitmap.rows;
 | 
				
			||||||
  pitch = GlyphData->bitmap.pitch;
 | 
					  pitch = GlyphData->bitmap.pitch;
 | 
				
			||||||
  bitmap = MALLOC(uchar, rows * pitch);
 | 
					  bitmap = MALLOC(uchar, rows * pitch);
 | 
				
			||||||
  memcpy(bitmap, GlyphData->bitmap.buffer, rows * pitch);
 | 
					  if (int bytes = rows * pitch)
 | 
				
			||||||
 | 
					     memcpy(bitmap, GlyphData->bitmap.buffer, bytes);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cGlyph::~cGlyph()
 | 
					cGlyph::~cGlyph()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user