Skip to content

Commit

Permalink
Merge pull request #25 from crydotsnake/master
Browse files Browse the repository at this point in the history
Vendor auf Version 0.8.3 Aktualisiert
  • Loading branch information
crydotsnake authored Jan 4, 2019
2 parents f128fd5 + 9311e06 commit 3dc877d
Show file tree
Hide file tree
Showing 218 changed files with 1,088 additions and 28,279 deletions.
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
*.iml
modules.xml
.idea/misc.xml
.idea/vcs.xml
.idea/encodings.xml
*.ipr
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
### Modulsammlung - Changelog
### PDFOut - Changelog
___

### 04.01.2019 Version 1.5.0
- Vendor update 0.8.3
- The new project lead is [Simon Krull](http://github.com/crydotsnake)

### 09.08.2018 Version 1.4.2
- changes in readme

Expand Down
2 changes: 1 addition & 1 deletion boot.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

if (!rex::isBackend()) {
require_once $this->getPath('vendor/dompdf/'.'autoload.inc.php');
require_once $this->getPath('vendor/dompdf/src/'.'Autoloader.php');
}

2 changes: 1 addition & 1 deletion package.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Alle hier gesetzten Werte können über $addon->getProperty($key) abgefragt werden

package: pdfout
version: '1.4.2'
version: '1.5.0'
author: Friends Of REDAXO
supportpage: https://github.com/FriendsOfREDAXO/pdfout
requires:
Expand Down
20 changes: 0 additions & 20 deletions vendor/dompdf/.travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/dompdf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ https://github.com/dompdf/dompdf/wiki/Requirements
PDF documents internally support the following fonts: Helvetica, Times-Roman,
Courier, Zapf-Dingbats, & Symbol. These fonts only support Windows ANSI
encoding. In order for a PDF to display characters that are not available in
Windows ANSI you must supply an external font. Dompdf will embed any referenced
Windows ANSI, you must supply an external font. Dompdf will embed any referenced
font in the PDF so long as it has been pre-loaded or is accessible to dompdf and
reference in CSS @font-face rules. See the
[font overview](https://github.com/dompdf/dompdf/wiki/About-Fonts-and-Character-Encoding)
Expand Down
2 changes: 1 addition & 1 deletion vendor/dompdf/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.2
<75f13c70>
39 changes: 0 additions & 39 deletions vendor/dompdf/autoload.inc.php

This file was deleted.

8 changes: 6 additions & 2 deletions vendor/dompdf/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,20 @@
},
"require": {
"php": ">=5.4.0",
"ext-gd": "*",
"ext-dom": "*",
"ext-mbstring": "*",
"phenx/php-font-lib": "0.5.*",
"phenx/php-svg-lib": "0.3.*"
},
"require-dev": {
"phpunit/phpunit": "4.8.*",
"phpunit/phpunit": "^4.8|^5.5|^6.5",
"squizlabs/php_codesniffer": "2.*"
},
"suggest": {
"ext-gd": "Needed to process images",
"ext-imagick": "Improves image processing performance",
"ext-gmagick": "Improves image processing performance"
},
"extra": {
"branch-alias": {
"dev-develop": "0.7-dev"
Expand Down
12 changes: 6 additions & 6 deletions vendor/dompdf/lib/Cpdf.php
Original file line number Diff line number Diff line change
Expand Up @@ -464,28 +464,28 @@ protected function o_viewerPreferences($id, $action, $options = '')
// Named with limited valid values
case 'NonFullScreenPageMode':
if (!in_array($v, array('UseNone', 'UseOutlines', 'UseThumbs', 'UseOC'))) {
continue;
break;
}
$o['info'][$k] = $v;
break;

case 'Direction':
if (!in_array($v, array('L2R', 'R2L'))) {
continue;
break;
}
$o['info'][$k] = $v;
break;

case 'PrintScaling':
if (!in_array($v, array('None', 'AppDefault'))) {
continue;
break;
}
$o['info'][$k] = $v;
break;

case 'Duplex':
if (!in_array($v, array('None', 'AppDefault'))) {
continue;
break;
}
$o['info'][$k] = $v;
break;
Expand Down Expand Up @@ -4801,12 +4801,12 @@ protected function addImagePngAlpha($file, $x, $y, $w, $h, $byte)
imagesavealpha($img, false);

// create temp alpha file
$tempfile_alpha = tempnam($this->tmp, "cpdf_img_");
$tempfile_alpha = @tempnam($this->tmp, "cpdf_img_");
@unlink($tempfile_alpha);
$tempfile_alpha = "$tempfile_alpha.png";

// create temp plain file
$tempfile_plain = tempnam($this->tmp, "cpdf_img_");
$tempfile_plain = @tempnam($this->tmp, "cpdf_img_");
@unlink($tempfile_plain);
$tempfile_plain = "$tempfile_plain.png";

Expand Down
Loading

0 comments on commit 3dc877d

Please sign in to comment.