Merge pull request #867 from EC-CUBE/dependabot/composer/setasign/fpd…

…i-2.6.0 Bump setasign/fpdi from 1.6.2 to 2.6.0
EC-CUBE · Apr 17, 2024 · e3ed433 · e3ed433
2 parents d2e2694 + 6f6958e
commit e3ed433
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -45,7 +45,7 @@
         "pear/xml_serializer": "*",
         "pear/xml_util": "*",
         "setasign/fpdf": "^1.8",
-        "setasign/fpdi": "^1.6",
+        "setasign/fpdi": "^2.6",
         "smarty/smarty": "^3.1 || ^4.3"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/data/module/fpdi/japanese.php b/data/module/fpdi/japanese.php
@@ -1,5 +1,6 @@
 <?php
 
+use setasign\Fpdi\Fpdi;
 $SJIS_widths = array(' '=>278,'!'=>299,'"'=>353,'#'=>614,'$'=>614,'%'=>721,'&'=>735,'\''=>216,
 	'('=>323,')'=>323,'*'=>449,'+'=>529,','=>219,'-'=>306,'.'=>219,'/'=>453,'0'=>614,'1'=>614,
 	'2'=>614,'3'=>614,'4'=>614,'5'=>614,'6'=>614,'7'=>614,'8'=>614,'9'=>614,':'=>219,';'=>219,
@@ -11,7 +12,7 @@
 	'n'=>579,'o'=>550,'p'=>578,'q'=>566,'r'=>410,'s'=>444,'t'=>340,'u'=>575,'v'=>512,'w'=>760,
 	'x'=>503,'y'=>529,'z'=>453,'{'=>326,'|'=>380,'}'=>326,'~'=>387);
 
-class PDF_Japanese extends FPDI
+class PDF_Japanese extends Fpdi
 {
 function AddCIDFont($family, $style, $name, $cw, $CMap, $registry)
 {