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

eliminating unnecessary returns 

git-svn-id: https://svn.php.net/repository/pear/packages/Spreadsheet_Excel_Writer/trunk@138413 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Xavier Noguer Gallego 2003-08-21 13:49:17 +00:00
parent 3d4f827806
commit 0285406f8a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Writer/Worksheet.php
View File

@ -3010,7 +3010,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
// Open file. // Open file.
$bmp_fd = @fopen($bitmap,"rb"); $bmp_fd = @fopen($bitmap,"rb");
if (!$bmp_fd) { if (!$bmp_fd) {
return($this->raiseError("Couldn't import $bitmap")); $this->raiseError("Couldn't import $bitmap");
} }
// Slurp the file into a string. // Slurp the file into a string.
@ -3018,13 +3018,13 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
// Check that the file is big enough to be a bitmap. // Check that the file is big enough to be a bitmap.
if (strlen($data) <= 0x36) { if (strlen($data) <= 0x36) {
return($this->raiseError("$bitmap doesn't contain enough data.\n")); $this->raiseError("$bitmap doesn't contain enough data.\n");
} }
// 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("A2", $data);
if ($identity[''] != "BM") { if ($identity[''] != "BM") {
return($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");
} }
// Remove bitmap data: ID. // Remove bitmap data: ID.
@ -3048,20 +3048,20 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
$height = $width_and_height[2]; $height = $width_and_height[2];
$data = substr($data, 8); $data = substr($data, 8);
if ($width > 0xFFFF) { if ($width > 0xFFFF) {
return($this->raiseError("$bitmap: largest image width supported is 65k.\n")); $this->raiseError("$bitmap: largest image width supported is 65k.\n");
} }
if ($height > 0xFFFF) { if ($height > 0xFFFF) {
return($this->raiseError("$bitmap: largest image height supported is 65k.\n")); $this->raiseError("$bitmap: largest image height supported is 65k.\n");
} }
// Read and remove the bitmap planes and bpp data. Verify them. // Read and remove the bitmap planes and bpp data. Verify them.
$planes_and_bitcount = unpack("v2", substr($data, 0, 4)); $planes_and_bitcount = unpack("v2", substr($data, 0, 4));
$data = substr($data, 4); $data = substr($data, 4);
if ($planes_and_bitcount[2] != 24) { // Bitcount if ($planes_and_bitcount[2] != 24) { // Bitcount
return($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) {
return($this->raiseError("$bitmap: only 1 plane nupported in bitmap image.\n")); $this->raiseError("$bitmap: only 1 plane nupported in bitmap image.\n");
} }
// Read and remove the bitmap compression. Verify compression. // Read and remove the bitmap compression. Verify compression.
@ -3070,7 +3070,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
//$compression = 0; //$compression = 0;
if ($compression[""] != 0) { if ($compression[""] != 0) {
return($this->raiseError("$bitmap: compression not supported in bitmap image.\n")); $this->raiseError("$bitmap: compression not supported in bitmap image.\n");
} }
// Remove bitmap data: data size, hres, vres, colours, imp. colours. // Remove bitmap data: data size, hres, vres, colours, imp. colours.