[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32bdf.c
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32bdf.c |
Date: |
Tue, 04 Feb 2003 09:03:49 -0500 |
Index: emacs/src/w32bdf.c
diff -c emacs/src/w32bdf.c:1.16 emacs/src/w32bdf.c:1.17
*** emacs/src/w32bdf.c:1.16 Sun Feb 17 18:41:26 2002
--- emacs/src/w32bdf.c Tue Feb 4 09:03:13 2003
***************
*** 54,60 ****
#define FONT_CACHE_SLOT_OVER_P(p) ((p) >= cached_bitmap_slots +
BDF_FONT_CACHE_SIZE)
! static int
search_file_line(char *key, char *start, int len, char **val, char **next)
{
unsigned int linelen;
--- 54,60 ----
#define FONT_CACHE_SLOT_OVER_P(p) ((p) >= cached_bitmap_slots +
BDF_FONT_CACHE_SIZE)
! static int
search_file_line(char *key, char *start, int len, char **val, char **next)
{
unsigned int linelen;
***************
*** 73,79 ****
*val = start + strlen(key);
return 1;
}
!
return 0;
}
--- 73,79 ----
*val = start + strlen(key);
return 1;
}
!
return 0;
}
***************
*** 276,282 ****
}
bdffontp = (bdffont *) xmalloc(sizeof(bdffont));
!
for(i = 0;i < BDF_FIRST_OFFSET_TABLE;i++)
bdffontp->chtbl[i] = NULL;
bdffontp->size = fileinfo.nFileSizeLow;
--- 276,282 ----
}
bdffontp = (bdffont *) xmalloc(sizeof(bdffont));
!
for(i = 0;i < BDF_FIRST_OFFSET_TABLE;i++)
bdffontp->chtbl[i] = NULL;
bdffontp->size = fileinfo.nFileSizeLow;
***************
*** 285,291 ****
bdffontp->hfilemap = hfilemap;
bdffontp->filename = (char*) xmalloc(strlen(filename) + 1);
strcpy(bdffontp->filename, filename);
!
if (!set_bdf_font_info(bdffontp))
{
w32_free_bdf_font(bdffontp);
--- 285,291 ----
bdffontp->hfilemap = hfilemap;
bdffontp->filename = (char*) xmalloc(strlen(filename) + 1);
strcpy(bdffontp->filename, filename);
!
if (!set_bdf_font_info(bdffontp))
{
w32_free_bdf_font(bdffontp);
***************
*** 364,370 ****
{
pch = fontp->chtbl[BDF_FIRST_OFFSET(index)] =
(font_char*) HeapAlloc(hbdf_cp_heap,
! HEAP_ZERO_MEMORY,
sizeof(font_char) *
BDF_SECOND_OFFSET_TABLE);
if (!pch) return NULL;
--- 364,370 ----
{
pch = fontp->chtbl[BDF_FIRST_OFFSET(index)] =
(font_char*) HeapAlloc(hbdf_cp_heap,
! HEAP_ZERO_MEMORY,
sizeof(font_char) *
BDF_SECOND_OFFSET_TABLE);
if (!pch) return NULL;
***************
*** 578,584 ****
pcb->row_byte_size = glyph.row_byte_size;
pch->pcbmp = pcb;
!
pcached_bitmap_latest++;
if (FONT_CACHE_SLOT_OVER_P(pcached_bitmap_latest))
pcached_bitmap_latest = cached_bitmap_slots;
--- 578,584 ----
pcb->row_byte_size = glyph.row_byte_size;
pch->pcbmp = pcb;
!
pcached_bitmap_latest++;
if (FONT_CACHE_SLOT_OVER_P(pcached_bitmap_latest))
pcached_bitmap_latest = cached_bitmap_slots;
***************
*** 649,655 ****
return 0;
textalign = GetTextAlign(hdc);
!
hFgBrush = CreateSolidBrush(GetTextColor(hdc));
hOrgBrush = SelectObject(hdc, hFgBrush);
--- 649,655 ----
return 0;
textalign = GetTextAlign(hdc);
!
hFgBrush = CreateSolidBrush(GetTextColor(hdc));
hOrgBrush = SelectObject(hdc, hFgBrush);
***************
*** 679,685 ****
{
width = pcb->metric.bbw;
height = pcb->metric.bbh;
!
if (!(hBMP
&& (DIBsection_hdc == hdc)
&& (DIBsection_width == width)
--- 679,685 ----
{
width = pcb->metric.bbw;
height = pcb->metric.bbh;
!
if (!(hBMP
&& (DIBsection_hdc == hdc)
&& (DIBsection_width == width)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/w32bdf.c,
Juanma Barranquero <=