Clientbase
/
Spreadsheet_Excel_Writer
mirror of https://github.com/basemaster/Spreadsheet_Excel_Writer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unpack() doesn't support anonymous elements anymore 

git-svn-id: https://svn.php.net/repository/pear/packages/Spreadsheet_Excel_Writer/trunk@156210 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Xavier Noguer Gallego 2004-04-16 00:21:25 +00:00
parent 1916be290b
commit 2c06f54f47
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Writer/Worksheet.php
View File

@ -3399,8 +3399,8 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
} }
// The first 2 bytes are used to identify the bitmap. // The first 2 bytes are used to identify the bitmap.
$identity = unpack("A2", $data); $identity = unpack("A2ident", $data);
if ($identity[''] != "BM") { if ($identity['ident'] != "BM") {
$this->raiseError("$bitmap doesn't appear to be a valid bitmap image.\n"); $this->raiseError("$bitmap doesn't appear to be a valid bitmap image.\n");
} }
@ -3410,8 +3410,8 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
// Read and remove the bitmap size. This is more reliable than reading // Read and remove the bitmap size. This is more reliable than reading
// the data size at offset 0x22. // the data size at offset 0x22.
// //
$size_array = unpack("V", substr($data, 0, 4)); $size_array = unpack("Vsa", substr($data, 0, 4));
$size = $size_array['']; $size = $size_array['sa'];
$data = substr($data, 4); $data = substr($data, 4);
$size -= 0x36; // Subtract size of bitmap header. $size -= 0x36; // Subtract size of bitmap header.
$size += 0x0C; // Add size of BIFF header. $size += 0x0C; // Add size of BIFF header.
@ -3438,15 +3438,15 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
$this->raiseError("$bitmap isn't a 24bit true color bitmap.\n"); $this->raiseError("$bitmap isn't a 24bit true color bitmap.\n");
} }
if ($planes_and_bitcount[1] != 1) { if ($planes_and_bitcount[1] != 1) {
$this->raiseError("$bitmap: only 1 plane nupported in bitmap image.\n"); $this->raiseError("$bitmap: only 1 plane supported in bitmap image.\n");
} }
// Read and remove the bitmap compression. Verify compression. // Read and remove the bitmap compression. Verify compression.
$compression = unpack("V", substr($data, 0, 4)); $compression = unpack("Vcomp", substr($data, 0, 4));
$data = substr($data, 4); $data = substr($data, 4);
//$compression = 0; //$compression = 0;
if ($compression[""] != 0) { if ($compression['comp'] != 0) {
$this->raiseError("$bitmap: compression not supported in bitmap image.\n"); $this->raiseError("$bitmap: compression not supported in bitmap image.\n");
} }