diff --git a/composer.json b/composer.json index 1e6c651c4c638630b9e414502b6bc086532272d8..07e82a70b14cc03a3a622aa84e0ee30171200957 100644 --- a/composer.json +++ b/composer.json @@ -115,6 +115,7 @@ "drupal/entity_clone": "1.0.0-beta5", "drupal/entity_embed": "1.2", "drupal/entity_reference_revisions": "1.9", + "drupal/exif_orientation": "^1.1", "drupal/externalauth": "1.3", "drupal/field_group": "3.1", "drupal/field_permissions": "1.1", diff --git a/composer.lock b/composer.lock index 557189db7800fb69b8dce9a53dfd1c6a095efa24..4cb4b0e94e92cc1406f1d834f75a85a545cc9aae 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "82411979601c132b4463c73ab96ffd1e", + "content-hash": "09537e7c3c425c2a37646d9578cdef43", "packages": [ { "name": "alchemy/zippy", @@ -4169,6 +4169,54 @@ "source": "https://git.drupalcode.org/project/entity_reference_revisions" } }, + { + "name": "drupal/exif_orientation", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/exif_orientation.git", + "reference": "8.x-1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/exif_orientation-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "9b0e4325092bb9f37a0714c9587fa10823b4a023" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.1", + "datestamp": "1593659917", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "NickDickinsonWilde", + "homepage": "https://www.drupal.org/user/3094661" + }, + { + "name": "mglaman", + "homepage": "https://www.drupal.org/user/2416470" + } + ], + "description": "Rotates images per their EXIF Orientation", + "homepage": "https://www.drupal.org/project/exif_orientation", + "support": { + "source": "https://git.drupalcode.org/project/exif_orientation" + } + }, { "name": "drupal/externalauth", "version": "1.3.0", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 61abb2b8c2c34113812db04ee58d0e61ddc937d6..d18708d751d5a9dcb40f58e87bb4b7129016be5d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -4296,6 +4296,57 @@ }, "install-path": "../../web/modules/entity_reference_revisions" }, + { + "name": "drupal/exif_orientation", + "version": "1.1.0", + "version_normalized": "1.1.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/exif_orientation.git", + "reference": "8.x-1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/exif_orientation-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "9b0e4325092bb9f37a0714c9587fa10823b4a023" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.1", + "datestamp": "1593659917", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "installation-source": "dist", + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "NickDickinsonWilde", + "homepage": "https://www.drupal.org/user/3094661" + }, + { + "name": "mglaman", + "homepage": "https://www.drupal.org/user/2416470" + } + ], + "description": "Rotates images per their EXIF Orientation", + "homepage": "https://www.drupal.org/project/exif_orientation", + "support": { + "source": "https://git.drupalcode.org/project/exif_orientation" + }, + "install-path": "../../web/modules/exif_orientation" + }, { "name": "drupal/externalauth", "version": "1.3.0", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index fffa2c1090b8fcb936a0950ac303bbde31e75146..c845c1d5a9cc21cb7e5fe80623aa1f40986df7bd 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '460654a4c665182074508ea861518e67ea645505', + 'reference' => 'fac9eabc720d9078e27475a31fe74da8d079ac91', 'name' => 'osu-asc-webservices/d8-upstream', 'dev' => true, ), @@ -925,6 +925,15 @@ 'reference' => '8.x-1.9', 'dev_requirement' => false, ), + 'drupal/exif_orientation' => array( + 'pretty_version' => '1.1.0', + 'version' => '1.1.0.0', + 'type' => 'drupal-module', + 'install_path' => __DIR__ . '/../../web/modules/exif_orientation', + 'aliases' => array(), + 'reference' => '8.x-1.1', + 'dev_requirement' => false, + ), 'drupal/externalauth' => array( 'pretty_version' => '1.3.0', 'version' => '1.3.0.0', @@ -2092,7 +2101,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '460654a4c665182074508ea861518e67ea645505', + 'reference' => 'fac9eabc720d9078e27475a31fe74da8d079ac91', 'dev_requirement' => false, ), 'pantheon-systems/quicksilver-pushback' => array( diff --git a/web/modules/exif_orientation/LICENSE.txt b/web/modules/exif_orientation/LICENSE.txt new file mode 100644 index 0000000000000000000000000000000000000000..d159169d1050894d3ea3b98e1c965c4058208fe1 --- /dev/null +++ b/web/modules/exif_orientation/LICENSE.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/web/modules/exif_orientation/exif_orientation.info.yml b/web/modules/exif_orientation/exif_orientation.info.yml new file mode 100644 index 0000000000000000000000000000000000000000..e1bfb5af9954132c0f448ee2fdc647cf3e6961ad --- /dev/null +++ b/web/modules/exif_orientation/exif_orientation.info.yml @@ -0,0 +1,11 @@ +name: EXIF Orientation +type: module +description: 'Rotates images per their EXIF Orientation' +core: '8.x' +core_version_requirement: ^8 || ^9 +package: 'Media' + +# Information added by Drupal.org packaging script on 2020-07-02 +version: '8.x-1.1' +project: 'exif_orientation' +datestamp: 1593659919 diff --git a/web/modules/exif_orientation/exif_orientation.module b/web/modules/exif_orientation/exif_orientation.module new file mode 100644 index 0000000000000000000000000000000000000000..4a6f76cf4fda8a9b8a476de296509d2799539186 --- /dev/null +++ b/web/modules/exif_orientation/exif_orientation.module @@ -0,0 +1,93 @@ +<?php + +/** + * @file + * Module file for EXIF Orientation. + */ + +use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Form\FormStateInterface; +use Drupal\file\FileInterface; + +/** + * Implements hook_file_presave(). + */ +function exif_orientation_file_presave(EntityInterface $entity) { + // Provide EXIF Orientation correction. + _exif_orientation_rotate($entity); +} + +/** + * Implements hook_field_widget_form_alter(). + * + * Add a custom validator before file_validate_image_resolution(). + * file_validate_image_resolution resizes the image if it's too large losing the + * exif data in the process. + */ +function exif_orientation_field_widget_form_alter(&$element, FormStateInterface $form_state, $context) { + if(isset($element['#upload_validators']['file_validate_image_resolution'])){ + $element['#upload_validators'] = ['exif_orientation_validate_image_rotation' => []] + $element['#upload_validators']; + } +} + +/** + * Ensures that image orientation is according to exif data. + * + * @param \Drupal\file\FileInterface $file + * A file entity. This function may rotate the file. + * + * @return array + * An empty array. + * + * @see hook_file_validate() + */ +function exif_orientation_validate_image_rotation(FileInterface $file) { + _exif_orientation_rotate($file); + // This validator did not produce any errors. + return []; +} + +/** + * Rotates an image to its EXIF Orientation. + * + * iPhone 4 and up save all images in landscape, relying on EXIF data to + * set the orientation properly. This does not always translate well in the + * browser or other devices. + * @link: http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/ + */ +function _exif_orientation_rotate($file) { + if (function_exists('exif_read_data') && $file->getMimeType() == 'image/jpeg') { + $file_exif = @exif_read_data(\Drupal::service('file_system')->realpath($file->getFileUri())); + + // Ensure that the Orientation key|value exists, otherwise leave. + if (!is_array($file_exif) || !isset($file_exif['Orientation'])) { + return; + } + + // Orientation numbers and corresponding degrees. + // @note: Odd numbers are flipped images, would need different process. + switch ($file_exif['Orientation']) { + case 3: + $degrees = 180; + break; + + case 6: + $degrees = 90; + break; + + case 8: + $degrees = 270; + break; + + default: + $degrees = 0; + } + + if ($degrees > 0) { + $image = \Drupal::service('image.factory')->get($file->getFileUri()); + if ($image->rotate($degrees)) { + $image->save(); + } + } + } +} diff --git a/web/modules/exif_orientation/tests/exif_orientation.test b/web/modules/exif_orientation/tests/exif_orientation.test new file mode 100644 index 0000000000000000000000000000000000000000..f40cf4be66b7a45907b8d92c8f6d818b98579c48 --- /dev/null +++ b/web/modules/exif_orientation/tests/exif_orientation.test @@ -0,0 +1,111 @@ +<?php + +/** + * @file + * Tests for exif_orientation.module. + */ + +class ExifOrientationTest extends DrupalWebTestCase { + private $admin; + + public static function getInfo() { + return array( + 'name' => 'Exif Orientation', + 'description' => 'Tests automatic image orientation.', + 'group' => 'Exif Orientation', + ); + } + + public function setUp() { + $modules = array('image', 'exif_orientation'); + parent::setUp($modules); + + // Set to high quality because we don't want encoding artifacts. + variable_set('image_jpeg_quality', 98); + + // Code from UserPictureTestCase: + + // Enable user pictures. + variable_set('user_pictures', 1); + + // Test if directories specified in settings exist in filesystem. + $file_dir = 'public://'; + $file_check = file_prepare_directory($file_dir, FILE_CREATE_DIRECTORY); + + $picture_dir = variable_get('user_picture_path', 'pictures'); + $picture_path = $file_dir . $picture_dir; + + $pic_check = file_prepare_directory($picture_path, FILE_CREATE_DIRECTORY); + $this->_directory_test = is_writable($picture_path); + $this->assertTrue($this->_directory_test, "The directory $picture_path doesn't exist or is not writable. Further tests won't be made."); + } + + /** + * Test auto rotation of uploaded user profile pictures. + */ + public function testUserPicture() { + // No user picture style or dimensions. + variable_set('user_picture_style', ''); + variable_set('user_picture_dimensions', ''); + $user1 = $this->drupalCreateUser(); + $this->saveUserPicture($user1); + $this->assertImageIsRotated($user1->picture->uri); + + // Applied user picture style. + variable_set('user_picture_style', 'medium'); + variable_set('user_picture_dimensions', ''); + $user2 = $this->drupalCreateUser(); + $this->saveUserPicture($user2); + $this->assertImageIsRotated($user2->picture->uri); + + // Defined picture dimensions. + variable_set('user_picture_style', ''); + variable_set('user_picture_dimensions', '50x50'); + $user3 = $this->drupalCreateUser(); + $this->saveUserPicture($user3); + $this->assertImageIsRotated($user3->picture->uri); + + // Defined picture style and dimensions. + variable_set('user_picture_style', 'medium'); + variable_set('user_picture_dimensions', '50x50'); + $user4 = $this->drupalCreateUser(); + $this->saveUserPicture($user4); + $this->assertImageIsRotated($user4->picture->uri); + } + + /** + * Uploads a user picture. + */ + private function saveUserPicture(&$account) { + $this->drupalLogin($account); + $edit = array('files[picture_upload]' => drupal_realpath(drupal_get_path('module', 'exif_orientation') . '/tests/rotate90cw.jpg')); + $this->drupalPost('user/' . $account->uid . '/edit', $edit, t('Save')); + $account = user_load($account->uid, TRUE); + $this->assertTrue(isset($account->picture) && isset($account->picture->uri), 'The picture has been uploaded successfully.'); + } + + /** + * Verify that an image is landscape and has a red top left corner. + */ + private function assertImageIsRotated($uri) { + $uri = drupal_realpath($uri); + + $img = image_load($uri); + $this->assertTrue(is_object($img), 'Image data is available.'); + + // Test the aspect ratio. + $this->assertTrue($img->info['width'] > $img->info['height'], 'The image format is landscape.'); + + // Verify the rotation by color inspection. + $rgb = imagecolorat($img->resource, 10, 10); + $r = ($rgb >> 16) & 0xFF; + $g = ($rgb >> 8) & 0xFF; + $b = $rgb & 0xFF; + // The top left corner should be red. + $this->assertTrue(abs($r - 255) < 5, 'Red color component is close to 255.'); + $this->assertTrue($g < 5, 'Green color component is close to 0.'); + $this->assertTrue($b < 5, 'Blue color component is close to 0.'); + } + +} + diff --git a/web/modules/exif_orientation/tests/rotate90cw.jpg b/web/modules/exif_orientation/tests/rotate90cw.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2c618adc882eb5d39f46c2c186dfccdbc7929028 --- /dev/null +++ b/web/modules/exif_orientation/tests/rotate90cw.jpg @@ -0,0 +1,121 @@ +�����JFIF��H�H������Exif��MM�*������������������J�������R(��������i�������Z�������H������H����������0210������0100������������������������X�������http://ns.adobe.com/xap/1.0/�<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?> +<x:xmpmeta xmlns:x='adobe:ns:meta/'> +<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'> + + <rdf:Description xmlns:exif='http://ns.adobe.com/exif/1.0/'> + <exif:Orientation>Right-top</exif:Orientation> + <exif:XResolution>72</exif:XResolution> + <exif:YResolution>72</exif:YResolution> + <exif:ResolutionUnit>Inch</exif:ResolutionUnit> + <exif:FlashPixVersion>FlashPix Version 1.0</exif:FlashPixVersion> + <exif:Orientation>Right-top</exif:Orientation> + <exif:XResolution>72</exif:XResolution> + <exif:YResolution>72</exif:YResolution> + <exif:ResolutionUnit>Inch</exif:ResolutionUnit> + <exif:FlashPixVersion>FlashPix Version 1.0</exif:FlashPixVersion> + <exif:Orientation>Right-top</exif:Orientation> + <exif:XResolution>72</exif:XResolution> + <exif:YResolution>72</exif:YResolution> + <exif:ResolutionUnit>Inch</exif:ResolutionUnit> + <exif:FlashPixVersion>FlashPix Version 1.0</exif:FlashPixVersion> + <exif:Orientation>Top-left</exif:Orientation> + <exif:XResolution>72</exif:XResolution> + <exif:YResolution>72</exif:YResolution> + <exif:ResolutionUnit>Inch</exif:ResolutionUnit> + <exif:FlashPixVersion>FlashPix Version 1.0</exif:FlashPixVersion> + <exif:Orientation>Right-top</exif:Orientation> + <exif:XResolution>72</exif:XResolution> + <exif:YResolution>72</exif:YResolution> + <exif:ResolutionUnit>Inch</exif:ResolutionUnit> + <exif:FlashPixVersion>FlashPix Version 1.0</exif:FlashPixVersion> + <exif:Orientation>Right-top</exif:Orientation> + <exif:XResolution>72</exif:XResolution> + <exif:YResolution>72</exif:YResolution> + <exif:ResolutionUnit>Inch</exif:ResolutionUnit> + <exif:FlashPixVersion>FlashPix Version 1.0</exif:FlashPixVersion> + <exif:Orientation>Right-top</exif:Orientation> + <exif:XResolution>72</exif:XResolution> + <exif:YResolution>72</exif:YResolution> + <exif:ResolutionUnit>Inch</exif:ResolutionUnit> + <exif:ExifVersion>Exif Version 2.1</exif:ExifVersion> + <exif:FlashPixVersion>FlashPix Version 1.0</exif:FlashPixVersion> + <exif:ColorSpace>Uncalibrated</exif:ColorSpace> + <exif:PixelXDimension>450</exif:PixelXDimension> + <exif:PixelYDimension>600</exif:PixelYDimension> + </rdf:Description> + +</rdf:RDF> +</x:xmpmeta> +<?xpacket end='r'?> +���C� + + + + + + + + +���C + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +���X��������������� ������������ �������<���������� 1�����������ϬO��������� 1�����������ϬO���������xG�h|�ܽo��������������������������ѻ�s���@�����������������������дf]�K7 ��������������������� Wc��^�Й������������������������� �u�C��4������������������������u~��~���������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld����������3����������Ld�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������0�K��������������������030����������������m���<�����������������EI�@]����������������O>�R�>wf����������������]8�i�8�@��������������� D��������������������#��������������������!��������������������������������������������������������������������������������������������������������������������������������������������������������3�����������CU&���������zUҀ�������� T�����������WJ���������$5Rk���������W�](�����������I���������^�t���������CU&���������zUҀ�������� T�����������WJ���������$5Rk���������W�](�����������I���������^�t���������CU&���������zUҀ�������� T�����������WJ���������$5Rk���������W�](�����������I���������^�t���������CU&���������zUҀ�������� T�����������WJ���������$5Rk���������W�](�����������I���������^�t���������CU&���������zUҀ�������� T�����������WJ���������$5Rk���������W�](��������-�sY�]�鿈���������WJ��������9�ns�Z������������ +�������������>�&���}�E|���������W�](��������5��ٗ��S�k��<���������WJ���������$5Rk���������W�](�����������I������������#��������P �`���������`~4��R������� U�� ����q�6�y����̔T��6`���l/�{\��|��?�(yz_�B �x,Sa�F�%�G�Uj���j�XuW��(5�E9N� �]�E��"|�z��\�"�B�7O�� +��X�sj�a��#��mv~�7�`8R�h��uWrٙi�Z-��R/�5~E I$Ӓ��밽3�N���q��ƙ8PW�4�2���x�$�?~�<�#�i|��3�Ɏ>:����(�^c��'����/��������!�1"AP2Q�#`�%Ra�����?��,�bsn7��mN�&S�����n%�O���������)4����'2��bz�/�8l0��[=�#�4fR���Z�C���jâ�=��O�����>��v�T��.�nuX�������څ�!����g����>�ZULAJ�tSR\�C٠:����B��J�vS�#�-� +I�5R���e=�3���z~�oU���d�A���P+4��5( HJE[�N"В�-o�㪓�r���\v��ZQs��,I^��})��MÁg>;��q/�����[mǛC�)mD�gӠ��P%_��湖��SЇ%32&_l�v4�i�-�Z\Eݟ������0�������!1�"APQa2`�#4qr������?��B�����hR��N��"�7Z �A���w�=�z;=�v��� BU���˕>�'���vc{��1�5\���I(DD)�h�$��q���97��r�j�%��0��:�8}72�=���1�� �6�k��n�K���L��c������jn���)s�� 0�T�.S��<�V�tc��P%!VaD�CTX0�#12�N�#�d)��ʲۂƧ��s�^���% �ODX�"��76.ϫe���T$�ӊ\��%$%���ov�t�le�Q6"1���6���V��`܅&4�#�1�#'�ѽD��'eehk�.$T��"r����NG��D�dž��i���|��ݥk��i�G��U�!�C�Xe��J��rH;RaKIL�����S��< ��E����$�b{�U�N6��d�"���7|A�������$�\�tK>�~�����8������!�1"APQ �2a�R`��#3BCq������?�|�ն��Ȋ֘-]�߶�S[�6��T��:X��k��nG�m�����|:� ��+4�k����c�~!J�rĐd%,͙Nt��&��wH�w����BK,�AqE�V�"�/o��mX<��GVc�Z�w�e�٭���XMB1Tk]���#pW������~[��ڂZ�Ine`���B��O�n&D�Svk0k2bӦ<��z: 7�����BC��KQS5K ��T��!� >�9��q��z���>��j�kmk۵�}Ũ�%EL����;(��<��'/���n�FMmxAQ����U�[��-��nޟ�S����eԴ�l7��\=���v<F�'��ف&B�Pr4�cl�V}�;���0�����"��w �/1�uD�-���n"���=�:���ҿ�-���{z_�M�1:l��1i���ϸs��4�{�O�c*�T���`�9~=�ӎ15F�Na��Dz8���� � 7���}8���4)��v�M�bvC�%���~6��`c�ˡX �LIn�Ue��� +���ҡ�6����K�4�C$=ML췉� 4�^s~��U�È���K�Щ5C�+#̌�eX�_j�' �%R+Q�)��[� ��������՚4Z5e����?��������i��7Y����h��%�͓��L�����U�u��O=CE�rK��'S.�'�ӽ����Na����u����@I�s1 Zsf�u�k�a�s_`��8�<�ɧ8�]�%7�hklI�a�Ҍ?��7 7J�jr��蛫m0R�t�����^�� +2p�t����b<�W3R���w#%�o����P�nB�R)�X�:�����T9�uY�Cj�9�~�Sc���h��/ ���i��V�}����_��� ���hu�#WJ��f����!ʍIv|j}r4��S�O�A9�o^����Qya��ҫ ɝ90�bEH?�oqeX^D�UF#M�����Y���m���N�ub���E,T)�YBE� ����J�q�Z�`�Y3$-�x���j7Q�r�s�j�/�I�!Gs�$�I�M��;��aDD<�@�D�� +��<!�bU����������c���7�n�T+�u����[C����A��K~�����\�p�y��uJO�|ۋ����ի{>�����$�������!1�APQa q`���������?!����' u,����$����L=ť� �L��f����=)Y�{���U0��rxY�O��-��q'��Աeʞ:��P� (&Jr�#��N�´��m�`��q�`煛���#s��B�}8�.p7r2��J5UZy{}\-� ����A���QBGZ���΅�Į�&���X�S]SzR��e,��F,��\ci��(B���e��qvOXD6�E�wNˁ���5�F��r�"����y�2^w�����aU �x���S�� ��'��oJ��7W]���py���Pv*�V`ϊ�o�AB(^Y���������vTI`f��x�ᤱd��A���?�ٖ}�\��0�W�_�+�����P�D��p\���`�Eቅ�SE T�(� ���ʨ��.9��?�T�������5���z�3��u=� ۃN��lP�3CS�ezt����O�{�˥�(c��i?=�������������������������������������������������������������������������������������������������������������Z�����������������������������������&������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������@��������������� ����������������������������������@����������������������������������� ������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������ @�����������������'����������������������������������������������������������������?���$��������!�1APQa`q���������?��!���"� �z5� '���a����K�!�m�{��{��F"i��۬=�fS��9���5A�]/<X���� �D�m�L*1d��JJ fs�{h +� ߒ�c.�v��Ng�ч�$DB2( &��L�9�_p������1�-����)xO� +#�G +kb�/���b���*XYfit��ز�����������������!�1APQ`a�����?��Ț"YD T��Ž8�Υ��=���E`��$3�PaAĄ�bp�3 4���x�F~y�M;&����#�;�_N�I� lC�t�t$�E'�W[�&,�% ��Vr."�t2���b_�L�f�h�2� ��ez�]&���ګ�@E�����g��B�B`���2#�x�S�ӷ�����,hlC_b�/V�0�|���1ެ�{W؞��iGgW����H3�>�=���$��������!�1AP Qa`���q������?�����lӑ&�D��φ{�; b�_�D*2��M���:���v1JpåECB!&�*�=TJ��ɗc�f��M J���[p��gl36O7"�"�:���Su�q�$�U +�;j��،B���<%�Y�`�h�V�W�R^��"�)5��C�A����`o�GT*:�B���62?�!\��Oh�X�r��a�f-��l��^���@|"�7���|��bL����&� 'TM��OD(,�OO��e����P:�7��%����W7W�g�Φ�~��@%X/�t+#�\BW���uPRO�� ��S +�[����g{��Nc�kRB|���a&���NGPB�{�,��8����^&�P�Z+%د�:~,�����?��~,8��%l����%}�?N��sQ�l�=�gI�(��+��T����s��[ |����w�Jl�s�MM��� v������ \ No newline at end of file