Re: [edk2] [Patch] BaseTools: fix the bug to add PaletteSize info into AutoGen

2016-11-29 Thread Gao, Liming
Reviewed-by: Liming Gao 

> -Original Message-
> From: Zhu, Yonghong
> Sent: Tuesday, November 29, 2016 7:41 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming 
> Subject: [Patch] BaseTools: fix the bug to add PaletteSize info into AutoGen
> 
> Fix the bug to add PaletteSize info into AutoGen.c when the flag
> UEFI_HII_RESOURCE_SECTION is set to FALSE.
> 
> Cc: Liming Gao 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Yonghong Zhu 
> ---
>  BaseTools/Source/Python/AutoGen/GenC.py | 7 ---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/GenC.py
> b/BaseTools/Source/Python/AutoGen/GenC.py
> index de6eb0e..63cfe04 100644
> --- a/BaseTools/Source/Python/AutoGen/GenC.py
> +++ b/BaseTools/Source/Python/AutoGen/GenC.py
> @@ -1693,14 +1693,15 @@ def CreateIdfFileCode(Info, AutoGenC, StringH,
> IdfGenCFlag, IdfGenBinBuffer):
>  TempBuffer += Buffer
>  elif File.Ext.upper() == '.BMP':
>  TempBuffer, TempPalette = 
> BmpImageDecoder(File, Buffer,
> PaletteIndex, FileObj.TransParent)
>  if len(TempPalette) > 1:
>  PaletteIndex += 1
> -PaletteBuffer += pack('H', 
> len(TempPalette))
> -PaletteBuffer += TempPalette
> +NewPalette = pack('H', len(TempPalette))
> +NewPalette += TempPalette
> +PaletteBuffer += NewPalette
>  PaletteStr = WriteLine(PaletteStr, '// 
> %s: %s: %s' %
> (DecToHexStr(PaletteIndex - 1, 4), ID, DecToHexStr(PaletteIndex - 1, 4)))
> -TempPaletteList = 
> AscToHexList(TempPalette)
> +TempPaletteList = 
> AscToHexList(NewPalette)
>  PaletteStr = WriteLine(PaletteStr,
> CreateArrayItem(TempPaletteList, 16) + '\n')
>  ImageBuffer += TempBuffer
>  BufferStr = WriteLine(BufferStr, '// %s: %s: %s' 
> %
> (DecToHexStr(Index, 4), ID, DecToHexStr(Index, 4)))
>  TempBufferList = AscToHexList(TempBuffer)
>  BufferStr = WriteLine(BufferStr,
> CreateArrayItem(TempBufferList, 16) + '\n')
> --
> 2.6.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel


[edk2] [Patch] BaseTools: fix the bug to add PaletteSize info into AutoGen

2016-11-29 Thread Yonghong Zhu
Fix the bug to add PaletteSize info into AutoGen.c when the flag
UEFI_HII_RESOURCE_SECTION is set to FALSE.

Cc: Liming Gao 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu 
---
 BaseTools/Source/Python/AutoGen/GenC.py | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py 
b/BaseTools/Source/Python/AutoGen/GenC.py
index de6eb0e..63cfe04 100644
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -1693,14 +1693,15 @@ def CreateIdfFileCode(Info, AutoGenC, StringH, 
IdfGenCFlag, IdfGenBinBuffer):
 TempBuffer += Buffer
 elif File.Ext.upper() == '.BMP':
 TempBuffer, TempPalette = 
BmpImageDecoder(File, Buffer, PaletteIndex, FileObj.TransParent)
 if len(TempPalette) > 1:
 PaletteIndex += 1
-PaletteBuffer += pack('H', 
len(TempPalette))
-PaletteBuffer += TempPalette
+NewPalette = pack('H', len(TempPalette))
+NewPalette += TempPalette
+PaletteBuffer += NewPalette
 PaletteStr = WriteLine(PaletteStr, '// %s: 
%s: %s' % (DecToHexStr(PaletteIndex - 1, 4), ID, DecToHexStr(PaletteIndex - 1, 
4)))
-TempPaletteList = AscToHexList(TempPalette)
+TempPaletteList = AscToHexList(NewPalette)
 PaletteStr = WriteLine(PaletteStr, 
CreateArrayItem(TempPaletteList, 16) + '\n')
 ImageBuffer += TempBuffer
 BufferStr = WriteLine(BufferStr, '// %s: %s: %s' % 
(DecToHexStr(Index, 4), ID, DecToHexStr(Index, 4)))
 TempBufferList = AscToHexList(TempBuffer)
 BufferStr = WriteLine(BufferStr, 
CreateArrayItem(TempBufferList, 16) + '\n')
-- 
2.6.1.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel