Selecting more thatn <img> due to preg_match_all

When there is more that one within the code and the 1st does not have the attribute data-picture-mapping , the matching will select from the 1st to then end of the with the data-picture-mapping

When I patched the file picture.module to look like the below it worked (Note the [^>] just after img.

function _picture_filter_process($text, $filter) {

// Find all img tags with a data-picture-mapping attribute.
preg_match_all('/]*?data-picture-mapping=".*?>/i', $text, $images1);
preg_match_all('/]*?data-picture-group=".*?>/i', $text, $images2);

I also noted that if the source had upper case instead of
Then this also caused a problem.

So I changed picture.module as follows:

function _picture_filter_prepare_image($image) {
// Make sure the closing tag is right.
$image = str_replace('/>', '>', $image);
$image = str_replace('>', ' />', $image);
$image = str_replace('