Tidy up some documentation

Remove @ error suppression

Change-Id: I6da825cf203377b6f25548f9d5112bade4be30d7
This commit is contained in:
Reedy 2012-10-04 17:34:25 +01:00
parent 7663952c34
commit c2eae6e584
2 changed files with 11 additions and 4 deletions

View file

@ -200,7 +200,7 @@ class PdfImage {
* of the image description page.
*
* @param $data Array metadata
* @return $data Array post-processed metadata
* @return Array post-processed metadata
*/
protected function postProcessDump( array $data ) {
@ -274,7 +274,7 @@ class PdfImage {
// mostly because I am unsure of what a good way to
// present that information to the user would be.
$pageSizes = array();
foreach( $val as $pageNumber => $page ) {
foreach( $val as $page ) {
if( isset( $page['Page size'] ) ) {
$pageSizes[ $page['Page size'] ] = true;
}

View file

@ -139,7 +139,11 @@ class PdfHandler extends ImageHandler {
$metadata = $image->getMetadata();
if ( !$metadata ) {
return $this->doThumbError( @$params['width'], @$params['height'], 'pdf_no_metadata' );
return $this->doThumbError(
isset( $params['width'] ) ? $params['width'] : null,
isset( $params['height'] ) ? $params['height'] : null,
'pdf_no_metadata'
);
}
if ( !$this->normaliseParams( $image, $params ) ) {
@ -306,7 +310,10 @@ class PdfHandler extends ImageHandler {
return $this->formatMetadataHelper( $meta['mergedMetadata'] );
}
/**
* @param $image
* @return bool|int
*/
function pageCount( $image ) {
$data = $this->getMetaArray( $image );
if ( !$data ) {