mirror of
				https://github.com/simon987/sist2.git
				synced 2025-11-04 09:36:53 +00:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			52466d5d8a
			...
			a4ecce363c
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| a4ecce363c | 
							
								
								
									
										30
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								.drone.yml
									
									
									
									
									
								
							@ -11,21 +11,6 @@ steps:
 | 
				
			|||||||
    image: simon987/sist2-build
 | 
					    image: simon987/sist2-build
 | 
				
			||||||
    commands:
 | 
					    commands:
 | 
				
			||||||
      - ./scripts/build.sh
 | 
					      - ./scripts/build.sh
 | 
				
			||||||
  - name: docker
 | 
					 | 
				
			||||||
    image: plugins/docker
 | 
					 | 
				
			||||||
    settings:
 | 
					 | 
				
			||||||
      username:
 | 
					 | 
				
			||||||
        from_secret: DOCKER_USER
 | 
					 | 
				
			||||||
      password:
 | 
					 | 
				
			||||||
        from_secret: DOCKER_PASSWORD
 | 
					 | 
				
			||||||
      repo: simon987/sist2
 | 
					 | 
				
			||||||
      context: ./
 | 
					 | 
				
			||||||
      dockerfile: ./Dockerfile
 | 
					 | 
				
			||||||
      auto_tag: true
 | 
					 | 
				
			||||||
      auto_tag_suffix: x64-linux
 | 
					 | 
				
			||||||
      when:
 | 
					 | 
				
			||||||
        event:
 | 
					 | 
				
			||||||
          - tag
 | 
					 | 
				
			||||||
  - name: scp files
 | 
					  - name: scp files
 | 
				
			||||||
    image: appleboy/drone-scp
 | 
					    image: appleboy/drone-scp
 | 
				
			||||||
    settings:
 | 
					    settings:
 | 
				
			||||||
@ -42,6 +27,21 @@ steps:
 | 
				
			|||||||
        - ./VERSION
 | 
					        - ./VERSION
 | 
				
			||||||
        - ./sist2-x64-linux
 | 
					        - ./sist2-x64-linux
 | 
				
			||||||
        - ./sist2-x64-linux-debug
 | 
					        - ./sist2-x64-linux-debug
 | 
				
			||||||
 | 
					  - name: docker
 | 
				
			||||||
 | 
					    image: plugins/docker
 | 
				
			||||||
 | 
					    settings:
 | 
				
			||||||
 | 
					      username:
 | 
				
			||||||
 | 
					        from_secret: DOCKER_USER
 | 
				
			||||||
 | 
					      password:
 | 
				
			||||||
 | 
					        from_secret: DOCKER_PASSWORD
 | 
				
			||||||
 | 
					      repo: simon987/sist2
 | 
				
			||||||
 | 
					      context: ./
 | 
				
			||||||
 | 
					      dockerfile: ./Dockerfile
 | 
				
			||||||
 | 
					      auto_tag: true
 | 
				
			||||||
 | 
					      auto_tag_suffix: x64-linux
 | 
				
			||||||
 | 
					      when:
 | 
				
			||||||
 | 
					        event:
 | 
				
			||||||
 | 
					          - tag
 | 
				
			||||||
 | 
					
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
kind: pipeline
 | 
					kind: pipeline
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							@ -1,6 +1,3 @@
 | 
				
			|||||||
[submodule "third-party/libscan"]
 | 
					 | 
				
			||||||
	path = third-party/libscan
 | 
					 | 
				
			||||||
	url = https://github.com/simon987/libscan
 | 
					 | 
				
			||||||
[submodule "third-party/argparse"]
 | 
					[submodule "third-party/argparse"]
 | 
				
			||||||
	path = third-party/argparse
 | 
						path = third-party/argparse
 | 
				
			||||||
	url = https://github.com/simon987/argparse
 | 
						url = https://github.com/simon987/argparse
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								sist2-vue/dist/css/index.css
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								sist2-vue/dist/css/index.css
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								sist2-vue/dist/js/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								sist2-vue/dist/js/index.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@ -133,6 +133,11 @@ export default Vue.extend({
 | 
				
			|||||||
  font-size: 80%;
 | 
					  font-size: 80%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.theme-black .version-badge {
 | 
				
			||||||
 | 
					  color: #eee !important;
 | 
				
			||||||
 | 
					  background: none;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.version-badge {
 | 
					.version-badge {
 | 
				
			||||||
  color: #222 !important;
 | 
					  color: #222 !important;
 | 
				
			||||||
  background: none;
 | 
					  background: none;
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										10
									
								
								third-party/libscan/libscan/raw/raw.c
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								third-party/libscan/libscan/raw/raw.c
									
									
									
									
										vendored
									
									
								
							@ -143,7 +143,7 @@ void parse_raw(scan_raw_ctx_t *ctx, vfile_t *f, document_t *doc) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    libraw_gps_info_t gps = libraw_lib->other.parsed_gps;
 | 
					    libraw_gps_info_t gps = libraw_lib->other.parsed_gps;
 | 
				
			||||||
    double gps_longitude_dec =
 | 
					    double gps_longitude_dec =
 | 
				
			||||||
            (gps.longtitude[0] + gps.longtitude[1] / 60 + gps.longtitude[2] / 3600) * DMS_REF(gps.longref);
 | 
					            (gps.longitude[0] + gps.longitude[1] / 60 + gps.longitude[2] / 3600) * DMS_REF(gps.longref);
 | 
				
			||||||
    snprintf(tmp, sizeof(tmp), "%.15f", gps_longitude_dec);
 | 
					    snprintf(tmp, sizeof(tmp), "%.15f", gps_longitude_dec);
 | 
				
			||||||
    if (gps_longitude_dec != 0.0) {
 | 
					    if (gps_longitude_dec != 0.0) {
 | 
				
			||||||
        APPEND_STR_META(doc, MetaExifGpsLongitudeDec, tmp)
 | 
					        APPEND_STR_META(doc, MetaExifGpsLongitudeDec, tmp)
 | 
				
			||||||
@ -163,7 +163,13 @@ void parse_raw(scan_raw_ctx_t *ctx, vfile_t *f, document_t *doc) {
 | 
				
			|||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    libraw_unpack_thumb(libraw_lib);
 | 
					    int unpack_ret = libraw_unpack_thumb(libraw_lib);
 | 
				
			||||||
 | 
					    if (unpack_ret != 0) {
 | 
				
			||||||
 | 
					        CTX_LOG_ERRORF(f->filepath, "libraw_unpack_thumb returned error code %d", unpack_ret)
 | 
				
			||||||
 | 
					        free(buf);
 | 
				
			||||||
 | 
					        libraw_close(libraw_lib);
 | 
				
			||||||
 | 
					        return;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    int errc = 0;
 | 
					    int errc = 0;
 | 
				
			||||||
    libraw_processed_image_t *thumb = libraw_dcraw_make_mem_thumb(libraw_lib, &errc);
 | 
					    libraw_processed_image_t *thumb = libraw_dcraw_make_mem_thumb(libraw_lib, &errc);
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										13
									
								
								third-party/libscan/test/main.cpp
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								third-party/libscan/test/main.cpp
									
									
									
									
										vendored
									
									
								
							@ -780,6 +780,19 @@ TEST(Arc, EncryptedZip) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* RAW */
 | 
					/* RAW */
 | 
				
			||||||
 | 
					TEST(RAW, Segfault1) {
 | 
				
			||||||
 | 
					    vfile_t f;
 | 
				
			||||||
 | 
					    document_t doc;
 | 
				
			||||||
 | 
					    load_doc_file("libscan-test-files/test_files/raw/segfault1.dng", &f, &doc);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    parse_raw(&raw_ctx, &f, &doc);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ASSERT_EQ(get_meta(&doc, MetaWidth)->long_val, 3840);
 | 
				
			||||||
 | 
					    ASSERT_EQ(get_meta(&doc, MetaHeight)->long_val, 7680);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    cleanup(&doc, &f);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST(RAW, Panasonic) {
 | 
					TEST(RAW, Panasonic) {
 | 
				
			||||||
    vfile_t f;
 | 
					    vfile_t f;
 | 
				
			||||||
    document_t doc;
 | 
					    document_t doc;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user