Add the resolution set in the 'image_serve' function

views/images/__init__.py

@@ -116,13 +116,17 @@ def image_serve( table, image_id, submission_id ):
             sql = "SELECT data, uuid FROM {} WHERE uuid = %s".format( table )
             p = ( image_id, )
     
-    elif table in [ "files", "thumbnails" ]:
+    elif table == "files":
+        sql = "SELECT data, uuid, resolution, format FROM {} WHERE uuid = %s".format( table )
+        p = ( image_id, )
+    
+    elif table == "thumbnails":
         sql = "SELECT data, uuid, format FROM {} WHERE uuid = %s".format( table )
         p = ( image_id, )
     
     elif table == "tenprint_cards":
         image_id, t = image_id
-        sql = "SELECT image_{} as data, id as uuid FROM {} WHERE id = %s".format( t, table )
+        sql = "SELECT image_{} as data, id as uuid, image_resolution AS resolution FROM {} WHERE id = %s".format( t, table )
         p = ( image_id, )
         need_to_decrypt = False
     
@@ -158,6 +162,9 @@ def image_serve( table, image_id, submission_id ):
         else:
             img = str2img( img )
         
+        if "resolution" in data:
+            img.info[ "dpi" ] = ( data[ "resolution" ], data[ "resolution" ] )
+
         current_app.logger.debug( "image: {}".format( img ) )
         
         return img, rid