minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* builds/vms/ftconfig.h: Synchronize. 

Problem reported by Alexei.
This commit is contained in:
Werner Lemberg 2014-07-12 16:37:39 +09:00
parent 35576bf067
commit e98e2bc1aa
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2014-07-12 Werner Lemberg <wl@gnu.org>
* builds/vms/ftconfig.h: Synchronize.
Problem reported by Alexei.
2014-07-11 Alexei Podtelezhnikov <apodtele@gmail.com>
[base] Clean up bitmap conversion.

6
builds/vms/ftconfig.h
View File

@ -4,7 +4,7 @@
/* */
/* VMS-specific configuration file (specification only). */
/* */
/* Copyright 1996-2004, 2006-2008, 2011, 2013 by */
/* Copyright 1996-2004, 2006-2008, 2011, 2013, 2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -359,7 +359,11 @@ FT_BEGIN_HEADER
__asm__ __volatile__ (
"smull %1, %2, %4, %3\n\t" /* (lo=%1,hi=%2) = a*b */
"mov %0, %2, asr #31\n\t" /* %0 = (hi >> 31) */
#if defined( __clang__ ) && defined( __thumb2__ )
"add.w %0, %0, #0x8000\n\t" /* %0 += 0x8000 */
#else
"add %0, %0, #0x8000\n\t" /* %0 += 0x8000 */
#endif
"adds %1, %1, %0\n\t" /* %1 += %0 */
"adc %2, %2, #0\n\t" /* %2 += carry */
"mov %0, %1, lsr #16\n\t" /* %0 = %1 >> 16 */