import v1.1.0_beta1 | 2009-08-21
This commit is contained in:
@ -174,7 +174,7 @@ abstract class Zend_Pdf_FileParser_Font extends Zend_Pdf_FileParser
|
||||
*/
|
||||
public function __set($property, $value)
|
||||
{
|
||||
if (is_null($value)) {
|
||||
if ($value === null) {
|
||||
unset($this->_fontProperties[$property]);
|
||||
} else {
|
||||
$this->_fontProperties[$property] = $value;
|
||||
@ -203,7 +203,9 @@ abstract class Zend_Pdf_FileParser_Font extends Zend_Pdf_FileParser
|
||||
$message = array_shift($args);
|
||||
$message = vsprintf($message, $args);
|
||||
}
|
||||
Zend_Log::log($message, Zend_Log::LEVEL_DEBUG, 'ZF');
|
||||
|
||||
$logger = new Zend_Log();
|
||||
$logger->log($message, Zend_Log::DEBUG);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -326,7 +326,7 @@ abstract class Zend_Pdf_FileParser_Font_OpenType extends Zend_Pdf_FileParser_Fon
|
||||
$nameOffset = $this->readUInt(2);
|
||||
|
||||
$languageCode = $this->_languageCodeForPlatform($platformID, $languageID);
|
||||
if (is_null($languageCode)) {
|
||||
if ($languageCode === null) {
|
||||
$this->_debugLog('Skipping languageID: 0x%x; platformID %d', $languageID, $platformID);
|
||||
continue; // Not a supported language. Move on.
|
||||
}
|
||||
@ -471,7 +471,7 @@ abstract class Zend_Pdf_FileParser_Font_OpenType extends Zend_Pdf_FileParser_Fon
|
||||
*/
|
||||
$this->numGlyphs = $this->readUInt(2);
|
||||
$this->_debugLog('number of glyphs: %d', $this->numGlyphs);
|
||||
|
||||
|
||||
// Skip other maxp table entries (if presented with table version 1.0)...
|
||||
}
|
||||
|
||||
@ -646,10 +646,10 @@ abstract class Zend_Pdf_FileParser_Font_OpenType extends Zend_Pdf_FileParser_Fon
|
||||
* even any of the extended latin characters, it is considered symbolic
|
||||
* to PDF and must be described differently in the Font Descriptor.
|
||||
*/
|
||||
/**
|
||||
/**
|
||||
* @todo Font is recognized as Adobe Latin subset font if it only contains
|
||||
* Basic Latin characters (only bit 0 of Unicode range bits is set).
|
||||
* Actually, other Unicode subranges like General Punctuation (bit 31) also
|
||||
* Actually, other Unicode subranges like General Punctuation (bit 31) also
|
||||
* fall into Adobe Latin characters. So this code has to be modified.
|
||||
*/
|
||||
$this->isAdobeLatinSubset = (($unicodeRange1 == 1) && ($unicodeRange2 == 0) &&
|
||||
|
@ -18,13 +18,11 @@
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
*/
|
||||
|
||||
/** Zend_Pdf_FileParser */
|
||||
/**
|
||||
* @see Zend_Pdf_FileParser
|
||||
*/
|
||||
require_once 'Zend/Pdf/FileParser.php';
|
||||
|
||||
/** Zend_Log */
|
||||
require_once 'Zend/Log.php';
|
||||
|
||||
|
||||
/**
|
||||
* FileParser for Zend_Pdf_Image subclasses.
|
||||
*
|
||||
@ -35,6 +33,11 @@ require_once 'Zend/Log.php';
|
||||
*/
|
||||
abstract class Zend_Pdf_FileParser_Image extends Zend_Pdf_FileParser
|
||||
{
|
||||
/**
|
||||
* Image Type
|
||||
*
|
||||
* @var integer
|
||||
*/
|
||||
protected $imageType;
|
||||
|
||||
/**
|
||||
@ -48,9 +51,7 @@ abstract class Zend_Pdf_FileParser_Image extends Zend_Pdf_FileParser
|
||||
public function __construct(Zend_Pdf_FileParserDataSource $dataSource)
|
||||
{
|
||||
parent::__construct($dataSource);
|
||||
$this->imageType = Zend_Pdf_Image::TYPE_UNKNOWN;
|
||||
$this->imageType = Zend_Pdf_Image::TYPE_UNKNOWN;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
Reference in New Issue
Block a user