Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit d1f7d8d

Browse files
author
Charles Ma
committed
ENH: refs #233 Fixed Phmagick license
1 parent 350a715 commit d1f7d8d

File tree

12 files changed

+19
-233
lines changed

12 files changed

+19
-233
lines changed

‎modules/thumbnailcreator/library/Phmagick/phmagick.php‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
7-
8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
2+
203
/*
214
+--------------------------------------------------------------------------------------------+
225
| DISCLAIMER - LEGAL NOTICE - |

‎modules/thumbnailcreator/library/Phmagick/plugins/cli.php‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,12 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
7-
8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
20-
212
/*
223
+--------------------------------------------------------------------------------------------+
234
| DISCLAIMER - LEGAL NOTICE - |
245
+--------------------------------------------------------------------------------------------+
256
| |
267
| This program is free for non comercial use, see the license terms available at |
278
| http://www.francodacosta.com/licencing/ for more information |
28-
| |
9+
| |
2910
| This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; |
3011
| without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
3112
| |
@@ -55,9 +36,9 @@ function cmd(phmagick $p, $string){
5536
%height
5637
%source
5738
%destination
58-
%tmp
39+
%tmp
5940
*/
60-
41+
6142
}
6243
}
6344
?>

‎modules/thumbnailcreator/library/Phmagick/plugins/color.php‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,13 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
7-
8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
2+
203
/*
214
+--------------------------------------------------------------------------------------------+
225
| DISCLAIMER - LEGAL NOTICE - |
236
+--------------------------------------------------------------------------------------------+
247
| |
258
| This program is free for non comercial use, see the license terms available at |
269
| http://www.francodacosta.com/licencing/ for more information |
27-
| |
10+
| |
2811
| This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; |
2912
| without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
3013
| |
@@ -93,7 +76,7 @@ function brighten(phmagick $p, $alphaValue = 50){
9376
$p->setHistory($p->getDestination());
9477
return $p ;
9578
}
96-
79+
9780
/**
9881
* Convert's the image to grayscale
9982
*/
@@ -115,7 +98,7 @@ function toGreyScale(phmagick $p, $enhance=2){
11598
$cmd .= ' -sigmoidal-contrast '.$enhance.'x50%' ;
11699
$cmd .= ' -background "none" "' . $p->getSource().'"' ;
117100
$cmd .= ' "' . $p->getDestination() .'"';
118-
101+
119102
$p->execute($cmd);
120103
$p->setSource($p->getDestination());
121104
$p->setHistory($p->getDestination());
@@ -136,7 +119,7 @@ function invertColors(phmagick $p){
136119
$p->setHistory($p->getDestination());
137120
return $p ;
138121
}
139-
122+
140123
function sepia(phmagick $p, $tone = 90){
141124
$cmd = $p->getBinary('convert');
142125
$cmd .= ' -sepia-tone '. $tone .'% ' ;
@@ -149,18 +132,18 @@ function sepia(phmagick $p, $tone = 90){
149132
$p->setHistory($p->getDestination());
150133
return $p ;
151134
}
152-
135+
153136
function autoLevels(phmagick $p){
154137
$cmd = $p->getBinary('convert');
155138
$cmd .= ' -normalize ' ;
156139
$cmd .= ' -background "none" "' . $p->getSource().'"' ;
157140
$cmd .= ' "' . $p->getDestination() .'"' ;
158-
141+
159142
$p->execute($cmd);
160143
$p->setSource($p->getDestination());
161144
$p->setHistory($p->getDestination());
162145
return $p ;
163146
}
164-
147+
165148
}
166149
?>

‎modules/thumbnailcreator/library/Phmagick/plugins/compose.php‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
7-
8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
202
/*
213
+--------------------------------------------------------------------------------------------+
224
| DISCLAIMER - LEGAL NOTICE - |

‎modules/thumbnailcreator/library/Phmagick/plugins/convert.php‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
7-
8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
202
/*
213
+--------------------------------------------------------------------------------------------+
224
| DISCLAIMER - LEGAL NOTICE - |

‎modules/thumbnailcreator/library/Phmagick/plugins/crop.php‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,12 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
7-
8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
202
/*
213
+--------------------------------------------------------------------------------------------+
224
| DISCLAIMER - LEGAL NOTICE - |
235
+--------------------------------------------------------------------------------------------+
246
| |
257
| This program is free for non comercial use, see the license terms available at |
268
| http://www.francodacosta.com/licencing/ for more information |
27-
| |
9+
| |
2810
| This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; |
2911
| without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
3012
| |

‎modules/thumbnailcreator/library/Phmagick/plugins/decorations.php‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
7-
8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
202
/*
213
+--------------------------------------------------------------------------------------------+
224
| DISCLAIMER - LEGAL NOTICE - |

‎modules/thumbnailcreator/library/Phmagick/plugins/enhancements.php‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
7-
8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
202
/*
213
+--------------------------------------------------------------------------------------------+
224
| DISCLAIMER - LEGAL NOTICE - |

‎modules/thumbnailcreator/library/Phmagick/plugins/info.php‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,13 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
72

8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
203
/*
214
+--------------------------------------------------------------------------------------------+
225
| DISCLAIMER - LEGAL NOTICE - |
236
+--------------------------------------------------------------------------------------------+
247
| |
258
| This program is free for non comercial use, see the license terms available at |
269
| http://www.francodacosta.com/licencing/ for more information |
27-
| |
10+
| |
2811
| This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; |
2912
| without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
3013
| |
@@ -50,24 +33,24 @@ function getInfo(phmagick $p, $file=''){
5033
if ($file == '') $file = $p->getSource();
5134
return getimagesize ($file);
5235
}
53-
36+
5437
function getWidth(phmagick $p, $file=''){
5538
list($width, $height, $type, $attr) = $this->getInfo($p, $file);
5639
return $width;
5740
}
58-
41+
5942
function getHeight(phmagick $p, $file=''){
6043
list($width, $height, $type, $attr) = $this->getInfo($p, $file);
6144
return $height;
6245
}
63-
64-
46+
47+
6548
function getBits(phmagick $p, $file=''){
6649
if ($file == '') $file = $p->getSource();
6750
$info = getimagesize ($file);
6851
return $info["bits"];
6952
}
70-
53+
7154
function getMime(phmagick $p, $file=''){
7255
if ($file == '') $file = $p->getSource();
7356
$info = getimagesize ($file);

‎modules/thumbnailcreator/library/Phmagick/plugins/resize.php‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
11
<?php
2-
/*=========================================================================
3-
MIDAS Server
4-
Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
5-
All rights reserved.
6-
More information http://www.kitware.com
7-
8-
Licensed under the Apache License, Version 2.0 (the "License");
9-
you may not use this file except in compliance with the License.
10-
You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0.txt
13-
14-
Unless required by applicable law or agreed to in writing, software
15-
distributed under the License is distributed on an "AS IS" BASIS,
16-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
See the License for the specific language governing permissions and
18-
limitations under the License.
19-
=========================================================================*/
202
/*
213
+--------------------------------------------------------------------------------------------+
224
| DISCLAIMER - LEGAL NOTICE - |

0 commit comments

Comments
 (0)